98fad1 Rebase to 20150519svn17469-1

Authored and Committed by Paolo Bonzini 9 years ago
    Rebase to 20150519svn17469-1
    
        
file modified
+8 -6
file modified
+1 -1