tree ba6cf978a3b0a7389e7b5cf1244831ccd352f501
parent 0c2363ffec4d99f8602f94d5b3f7747fe54ab679
parent 33b458d276bbdbe28febac0742835002b9f4778d
author Paolo Bonzini <pbonzini@redhat.com> 1404139540 +0200
committer Paolo Bonzini <pbonzini@redhat.com> 1404139540 +0200

Merge commit '33b458d276bb' into kvm-master