Merge remote branch 'jwandborg/f519_cloudfiles_performance_fix'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 28 Aug 2011 02:08:10 +0000 (21:08 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 28 Aug 2011 02:08:10 +0000 (21:08 -0500)

Trivial merge