From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 21 Nov 2011 20:36:55 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/master' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1571b6cba25df6d000b2539b8ba399839d15f9b6;p=qemu.git

Merge remote-tracking branch 'origin/master' into staging
---

1571b6cba25df6d000b2539b8ba399839d15f9b6