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

Conflicts:
	classes/statusnet.ini

diff --cc classes/Profile.php
Simple merge

diff --cc classes/User.php
Simple merge

diff --cc classes/statusnet.ini
index 6a7be100806534916213ff49878456b22ce0cf97,8572ea8ac5335ea9b27f9d37d0993ff48447259d..b2509dac5bc36cb199ebd0282ab22d4f1e1fe295
--- 1/classes/statusnet.ini
--- 2/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@@ -542,4 -524,24 +542,4 @@@ created = 14
  modified = 384
  
  [user_group__keys]
--id = N
 -
 -[user_role]
 -user_id = 129
 -role = 130
 -created = 142
 -
 -[user_role__keys]
 -user_id = K
 -role = K
 -
 -[login_token]
 -user_id = 129
 -token = 130
 -created = 142
 -modified = 384
 -
 -[login_token__keys]
 -user_id = K
 -token = K
 -
++id = N

diff --cc plugins/UserFlag/UserFlagPlugin.php
Simple merge