Merge branch 'testing' into 0.9.x

author Brion Vibber <brion@pobox.com>

Sun, 21 Mar 2010 23:28:56 +0000 (16:28 -0700)

committer Brion Vibber <brion@pobox.com>

Sun, 21 Mar 2010 23:28:56 +0000 (16:28 -0700)
author Brion Vibber <brion@pobox.com>
Sun, 21 Mar 2010 23:28:56 +0000 (16:28 -0700)
committer Brion Vibber <brion@pobox.com>
Sun, 21 Mar 2010 23:28:56 +0000 (16:28 -0700)
diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Sun, 21 Mar 2010 23:28:56 +0000 (16:28 -0700)
committer	Brion Vibber <brion@pobox.com>
	Sun, 21 Mar 2010 23:28:56 +0000 (16:28 -0700)