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

[derks]

commit a2dcec108d05db4e5416e56c08f5f58edcb23992
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Fri Mar 4 16:45:05 2011 -0600

    Merge branches 'HEAD' and 'master' into f14