Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Thu, 25 Mar 2010 17:50:49 +0000 (13:50 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 25 Mar 2010 17:50:49 +0000 (13:50 -0400)

Trivial merge