Merge branch 'bugfix/waldo_logout_view'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 1 Nov 2010 15:25:15 +0000 (11:25 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 1 Nov 2010 15:25:15 +0000 (11:25 -0400)

Trivial merge