Merge remote-tracking branch 'refs/remotes/brett/bug270-lazycelery-script'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 21 Mar 2012 04:24:43 +0000 (23:24 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 21 Mar 2012 04:24:43 +0000 (23:24 -0500)

Trivial merge