Merge remote-tracking branch 'qemu-kvm-tmp/memory/core' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 1 Sep 2011 18:55:58 +0000 (13:55 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 1 Sep 2011 18:55:58 +0000 (13:55 -0500)

Trivial merge