Merge branch '1.0.x' into schema-x

author Brion Vibber <brion@pobox.com>

Fri, 15 Oct 2010 18:40:40 +0000 (11:40 -0700)

committer Brion Vibber <brion@pobox.com>

Fri, 15 Oct 2010 18:40:40 +0000 (11:40 -0700)
author Brion Vibber <brion@pobox.com>
Fri, 15 Oct 2010 18:40:40 +0000 (11:40 -0700)
committer Brion Vibber <brion@pobox.com>
Fri, 15 Oct 2010 18:40:40 +0000 (11:40 -0700)
diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Fri, 15 Oct 2010 18:40:40 +0000 (11:40 -0700)
committer	Brion Vibber <brion@pobox.com>
	Fri, 15 Oct 2010 18:40:40 +0000 (11:40 -0700)