Merge remote-tracking branch 'qemu-kvm/memory/batch' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 25 Aug 2011 12:48:24 +0000 (07:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 25 Aug 2011 12:48:24 +0000 (07:48 -0500)

Trivial merge