From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 8 Apr 2014 09:41:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/mdroth/qga-pull-2014-4-7' into staging
X-Git-Tag: qemu-xen-4.5.0-rc1~43
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e792933ce1a9229d01b00f02caa39c39c30bcce8;p=qemu-upstream-4.5-testing.git

Merge remote-tracking branch 'remotes/mdroth/qga-pull-2014-4-7' into staging

* remotes/mdroth/qga-pull-2014-4-7:
  vss-win32: Fix build with mingw64-headers-3.1.0
  Makefile: add qga-vss-dll-obj-y to nested variables

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

e792933ce1a9229d01b00f02caa39c39c30bcce8