Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorZach Copley <zach@status.net>
Mon, 15 Feb 2010 21:14:01 +0000 (21:14 +0000)
committerZach Copley <zach@status.net>
Mon, 15 Feb 2010 21:14:01 +0000 (21:14 +0000)

Trivial merge