234b326 Merge remote branch 'origin/master' into f12

Merged and Committed by robert 13 years ago
    Merge remote branch 'origin/master' into f12
    
    Conflicts:
    	python-boto.spec
    
        
file modified
+9 -1