Merge remote branch 'remotes/cmoylan/test_auth_views_364'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 17 Jun 2011 13:59:55 +0000 (08:59 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 17 Jun 2011 13:59:55 +0000 (08:59 -0500)

Trivial merge