Merge branch 'kvm-master' into kvm-queue
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 14 Feb 2014 10:10:07 +0000 (11:10 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 14 Feb 2014 10:10:07 +0000 (11:10 +0100)

Trivial merge