Merge remote branch 'remotes/elrond/idea/csrf_improvement'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 15 Oct 2011 15:28:37 +0000 (10:28 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 15 Oct 2011 15:28:37 +0000 (10:28 -0500)

Trivial merge