Merge commit '33b458d276' into kvm-master

This commit is contained in:
Paolo Bonzini 2014-06-30 16:45:40 +02:00
commit 9a630d15f1