[python-cloudfiles/f15/master: 3/3] Merge branches 'HEAD' and 'master' into f15

[derks]

commit d054c2518de82f034016f55f10921bed9db1646b
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Fri Mar 4 16:43:03 2011 -0600

    Merge branches 'HEAD' and 'master' into f15