Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 2 Nov 2009 16:23:41 +0000 (11:23 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 2 Nov 2009 16:23:41 +0000 (11:23 -0500)

Trivial merge