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

diff --combined lib/noticelist.php
index 385da37e9d2b871edb5e5ea60f597cb2b716dd67,bf12bb73c5dfd4df71e48bee9503a08dc89b6d0a..027db2b3e1ea20ada1883282c505c2db940d45a0
--- 1/lib/noticelist.php
--- 2/lib/noticelist.php
+++ b/lib/noticelist.php
@@@ -75,7 -75,7 +75,7 @@@ class NoticeList extends Widge
      /**
       * show the list of notices
       *
 -     * "Uses up" the stream by looping through it. So, probably can't
 +     * "Uses up" the stream by looping through it. So, probably cannot
       * be called twice on the same list.
       *
       * @return int count of notices listed.
@@@ -513,7 -513,7 +513,7 @@@ class NoticeListItem extends Widge
          $user = common_current_user();
  
          if (!empty($user) &&
-             ($this->notice->profile_id == $user->id || $user->hasRight(Right::deleteOthersNotice))) {
+             ($this->notice->profile_id == $user->id || $user->hasRight(Right::DELETEOTHERSNOTICE))) {
  
              $deleteurl = common_local_url('deletenotice',
                                            array('notice' => $this->notice->id));