Merge remote branch 'remotes/cmoylan/test_auth_views_364'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 20 Jun 2011 00:56:25 +0000 (19:56 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 20 Jun 2011 00:56:25 +0000 (19:56 -0500)

Trivial merge