161a743 Updated patches from master-patches

Authored and Committed by pbrady 12 years ago
    Updated patches from master-patches
    
    - Suppress a warning from `nova-manage image convert`
    
        
file modified
+6 -1