Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorSarven Capadisli <csarven@status.net>
Thu, 14 Jan 2010 01:50:21 +0000 (01:50 +0000)
committerSarven Capadisli <csarven@status.net>
Thu, 14 Jan 2010 01:50:21 +0000 (01:50 +0000)

Trivial merge