]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'origin/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 14:25:36 +0000 (09:25 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 14:25:36 +0000 (09:25 -0500)

Trivial merge