Merge branch 'master' into celerysubmit
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 30 Apr 2011 13:27:15 +0000 (08:27 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 30 Apr 2011 13:27:15 +0000 (08:27 -0500)

Trivial merge