Merge commit '33b458d276bb' into kvm-master
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 30 Jun 2014 14:45:40 +0000 (16:45 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 30 Jun 2014 14:45:40 +0000 (16:45 +0200)

Trivial merge