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

[Daniel Bruno]

commit 212a7c5e2cc2c84f4ac02e88d171d76dbd02be14
Merge: 867489d b3090b1
Author: Daniel Bruno <danielbrunos at gmail.com>
Date:   Mon Apr 16 10:24:47 2012 -0400

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

 .gitignore           |    3 --
 python-libcloud.spec |   62 --------------------------------------------------
 sources              |    1 -
 3 files changed, 0 insertions(+), 66 deletions(-)
---