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

author Brion Vibber <brion@pobox.com>

Tue, 23 Mar 2010 15:21:32 +0000 (08:21 -0700)

committer Brion Vibber <brion@pobox.com>

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