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

Conflicts:
	classes/Profile.php

diff --combined classes/Profile.php
index c23fc1fed2083add4d9dc2cc09e4b74ff13b6f50,44ab210c15963163009c268d619e14209fb06112..b9c50905a79e6dd06a3b35d01f6f7e660204d7ff
--- 1/classes/Profile.php
--- 2/classes/Profile.php
+++ b/classes/Profile.php
@@@ -1324,7 -1324,7 +1324,7 @@@ class Profile extends Memcached_DataObj
          return $profile;
      }
  
-     function getLists($showPrivate)
+     function getLists()
      {
          $ids = array();
  
@@@ -1352,11 -1352,7 +1352,11 @@@
          $lists = array();
  
          foreach ($ids as $id) {
 -            $lists[] = Profile_list::staticGet('id', $id);
 +            $list = Profile_list::staticGet('id', $id);
 +            if (!empty($list) && 
 +                ($showPrivate || !$list->private)) {
 +                $lists[] = $list;
 +            }
          }
  
          return new ArrayWrapper($lists);