Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 22 Sep 2011 15:27:14 +0000 (10:27 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 22 Sep 2011 15:27:14 +0000 (10:27 -0500)

Trivial merge