Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
	lib/channel.php
	scripts/imdaemon.php

1 files changed, 8 insertions, 5 deletions

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 88a925241..0d4cd4dd9 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -442,11 +442,14 @@ class NoticeListItem extends Widget
                                               'title' => $latlon),
                                 $name);
         } else {
-            $this->out->elementStart('a', array('href' => $url));
-            $this->out->element('abbr', array('class' => 'geo',
-                                              'title' => $latlon),
-                                $name);
-            $this->out->elementEnd('a');
+            $xstr = new XMLStringer(false);
+            $xstr->elementStart('a', array('href' => $url,
+                                           'rel' => 'external'));
+            $xstr->element('abbr', array('class' => 'geo',
+                                         'title' => $latlon),
+                           $name);
+            $xstr->elementEnd('a');
+            $this->out->raw($xstr->getString());
         }
         $this->out->elementEnd('span');
     }