From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 5 May 2011 18:05:32 +0000 (-0500)
Subject: Merge remote-tracking branch 'mst/for_anthony' into staging
X-Git-Tag: v0.15.0-rc0~300
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3964f535c35c08470ac69bd553282af500bc8bb0;p=qemu.git

Merge remote-tracking branch 'mst/for_anthony' into staging
---

3964f535c35c08470ac69bd553282af500bc8bb0