]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'kwolf/block-stable' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 28 Nov 2011 17:15:10 +0000 (11:15 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 28 Nov 2011 17:15:10 +0000 (11:15 -0600)

Trivial merge