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

diff --cc actions/opensearch.php
Simple merge

diff --cc actions/register.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc lib/noticelist.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc lib/xmppqueuehandler.php
Simple merge

diff --cc plugins/Facebook/facebook/facebookapi_php5_restlib.php
Simple merge

diff --cc plugins/Facebook/facebookaction.php
Simple merge

diff --cc plugins/OpenID/openid.php
Simple merge

diff --cc plugins/TwitterBridge/daemons/synctwitterfriends.php
Simple merge

diff --cc plugins/TwitterBridge/daemons/twitterstatusfetcher.php
Simple merge

diff --cc scripts/console.php
Simple merge