Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Aug 2011 13:48:28 +0000 (08:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Aug 2011 13:48:28 +0000 (08:48 -0500)

Trivial merge