Merge branch 'master' into celerysubmit
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 1 May 2011 23:22:58 +0000 (18:22 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 1 May 2011 23:22:58 +0000 (18:22 -0500)

Trivial merge