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

Conflicts:
	classes/Memcached_DataObject.php

diff --cc classes/Memcached_DataObject.php
index a3a69e6672c7daeb7e9efbdcf3bb0a1e036da775,d830884b675de2a7669bdf2f0cbe4bc42af9a3f2..aab1cace6dbe2524a80321de59c4a4e7ad936649
--- 1/classes/Memcached_DataObject.php
--- 2/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@@ -66,7 -66,7 +66,6 @@@ class Memcached_DataObject extends DB_D
          // Clear this out so we don't accidentally break global
          // state in *this* process.
          $this->_DB_resultid = null;
- 
 -        
          // We don't have any local DBO refs, so clear these out.
          $this->_link_loaded = false;
      }