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

[Lubomir Rintel]

commit ae1578d5b964eefc5dc3d297b8979074a72bc549
Merge: 126e610 9bd6370
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Thu May 5 11:07:53 2011 +0200

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

 .gitignore                   |    2 +-
 s3cmd-0.9.8.1-noet.patch     |   24 ------------------------
 s3cmd-0.9.9.91-hashlib.patch |   32 --------------------------------
 s3cmd-1.0.0-manual.patch     |   31 +++++++++++++++++++++++++++++++
 s3cmd.spec                   |   18 ++++++++++++++++--
 sources                      |    2 +-
 6 files changed, 49 insertions(+), 60 deletions(-)
---
diff --cc .gitignore
index 0276b8c,1af7baa..a6f36c0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--s3cmd-0.9.9.91.tar.gz
+ /s3cmd-1.0.0.tar.gz