[s3cmd/el6: 4/4] Merge branch 'master' into el6

[Dennis Gilmore]

commit 48802a38131b88cc2411ded8dbff0eea182b8548
Merge: b96842f 06d3677
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Fri Feb 24 08:40:19 2012 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	s3cmd.spec

 .gitignore |    1 +
 s3cmd.spec |   10 ++++++++--
 sources    |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index a6f36c0,921f2bc..6fa70f2
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -s3cmd-0.9.9.91.tar.gz
  /s3cmd-1.0.0.tar.gz
+ /s3cmd-1.0.1.tar.gz