[python-cloudfiles/el5: 7/7] Merge branches 'HEAD' and 'el6' into el5

[derks]

commit a2f4ffcb9c859528e9a8aacc1e0b146c2afab7fb
Merge: be197eb 4828c74
Author: BJ Dierkes <wdierkes at rackspace.com>
Date:   Tue Feb 7 16:20:39 2012 -0600

    Merge branches 'HEAD' and 'el6' into el5

 .gitignore             |    1 +
 python-cloudfiles.spec |    5 ++++-
 sources                |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---