From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 31 Oct 2011 16:09:00 +0000 (-0500)
Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging
X-Git-Tag: v1.0-rc0~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8494a397b68124f9898e7912173d460ee99ba3e2;p=thirdparty%2Fqemu.git

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

Conflicts:
	block/vmdk.c
---

8494a397b68124f9898e7912173d460ee99ba3e2