Merge remote branch 'remotes/jwandborg/f477_cloudfiles'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 5 Aug 2011 03:16:49 +0000 (22:16 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 5 Aug 2011 03:16:49 +0000 (22:16 -0500)

Trivial merge