]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 31 May 2011 13:23:11 +0000 (08:23 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 31 May 2011 13:23:11 +0000 (08:23 -0500)

Trivial merge