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

[derks]

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

    Merge branches 'HEAD' and 'master' into el6