[python-libcloud/f17: 9/9] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-libcloud into f17

[Daniel Bruno]

commit 905cfa1656e29ce0a011c69307624a82089550d0
Merge: f371779 e4bb4e3
Author: Daniel Bruno <danielbrunos at gmail.com>
Date:   Mon Apr 16 11:09:21 2012 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-libcloud into f17
    
    Conflicts:
    	.gitignore

 .gitignore |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 7022d08,8cd5ca4..94f0a6c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,6 @@@
++<<<<<<< HEAD
++=======
+ /apache-libcloud-0.6.2.tar.bz2
+ /apache-libcloud-0.8.0.tar.bz2
++>>>>>>> e4bb4e355b49c0129a3a643ff2f18e47c2a133b6
  /apache-libcloud-0.9.1.tar.bz2