Merge remote-tracking branch 'kwolf/block-stable' into staging
commit54dcd0b37e3e4e9fb25cb4e9965d6ba45eb0d2b4
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 18 Nov 2011 19:30:08 +0000 (18 13:30 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 18 Nov 2011 19:30:08 +0000 (18 13:30 -0600)
tree4a182ca92348e6bf0b1293e9142d0496d3b661a7
parent7197390a0b6e38017af94135b6055d8b7c6c2370
parent33ebad12637a2e1503247fbb4d2960eaaff084ee
Merge remote-tracking branch 'kwolf/block-stable' into staging
qemu-doc.texi