[openstack-swift/el6: 9/11] Merge branch 'master' into el6

[Alan Pevec]

commit b06892ca11eaa489103ae5ca77ef89090525c0dc
Merge: 3039433 5a706a4
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed Jan 4 00:05:57 2012 +0100

    Merge branch 'master' into el6

 .gitignore           |    2 +-
 openstack-swift.spec |   10 +++++++---
 sources              |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 84856a4,060ff4a..98c5eeb
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,5 +1,2 @@@
  /swift-1.0.2.tar.gz
- /swift-1.4.3.tar.gz
 -/swift-1.1.0.tar.gz
 -/swift-1.4.0.tar.gz
 -/swift-1.4.3.tar.gz
+ /swift-1.4.4.tar.gz