From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 29 May 2012 09:31:29 +0000 (-0500)
Subject: Merge remote-tracking branch 'mdroth/qga-pull-5-24-12' into staging
X-Git-Tag: v1.1.0-rc4~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=422831fc81a4565d9687bc00bac685261a5dd67a;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'mdroth/qga-pull-5-24-12' into staging

* mdroth/qga-pull-5-24-12:
  qemu-ga: Fix missing environ declaration
  configure: check if environ is declared
---

422831fc81a4565d9687bc00bac685261a5dd67a