From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 19 Dec 2011 14:50:47 +0000 (-0600)
Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ddf83d0173c6a64a95a6640e4bfcea4cd789cad2;p=qemu.git

Merge remote-tracking branch 'kwolf/for-anthony' into staging
---

ddf83d0173c6a64a95a6640e4bfcea4cd789cad2