]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'aneesh/for-upstream-5' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 29 Sep 2011 18:32:05 +0000 (13:32 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 29 Sep 2011 18:32:05 +0000 (13:32 -0500)

Trivial merge