Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Wed, 24 Feb 2010 23:48:27 +0000 (15:48 -0800)
committerBrion Vibber <brion@pobox.com>
Wed, 24 Feb 2010 23:48:27 +0000 (15:48 -0800)

Trivial merge