f8be579 Rebase to latest upstream git snapshot

Authored and Committed by berrange 11 years ago
    Rebase to latest upstream git snapshot
    
        
file modified
+9 -10
file modified
+6 -3
file modified
+1 -1