[python-cloudfiles/el5/master: 2/2] Merge branches 'HEAD' and 'master' into el5

[derks]

commit be197eb8df2da9e80fdc225296d8f34c9730a6f9
Merge: c082b6d bf4aeb3
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Wed Apr 20 06:53:50 2011 -0500

    Merge branches 'HEAD' and 'master' into el5

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