60a9a2 Readd parts of patch 1 that are not upstream.

Authored and Committed by Paolo Bonzini 11 years ago
    Readd parts of patch 1 that are not upstream.
    
        
file added
+14
file modified
+3 -1