Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorSarven Capadisli <csarven@status.net>
Wed, 10 Feb 2010 11:09:03 +0000 (11:09 +0000)
committerSarven Capadisli <csarven@status.net>
Wed, 10 Feb 2010 11:09:03 +0000 (11:09 +0000)

Trivial merge