1bc7dd0 Merge branch 'master' into el6

Merged and Committed by bonzini 11 years ago
    Merge branch 'master' into el6
    
        
file modified
+1 -0
file added
+65
file added
+52
file modified
+65 -7
file modified
+1 -1