Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Tue, 2 Mar 2010 23:16:48 +0000 (15:16 -0800)
committerBrion Vibber <brion@pobox.com>
Tue, 2 Mar 2010 23:16:48 +0000 (15:16 -0800)

Trivial merge