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

diff --cc classes/Memcached_DataObject.php
Simple merge

diff --cc lib/adminpanelaction.php
Simple merge

diff --cc lib/apiaction.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/router.php
Simple merge