Merge remote-tracking branch 'qemu-kvm-tmp/memory/urgent' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Sep 2011 13:00:47 +0000 (08:00 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Sep 2011 13:00:47 +0000 (08:00 -0500)

Trivial merge