From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 30 May 2012 07:02:03 +0000 (+0800)
Subject: Merge remote-tracking branch 'mdroth/qga-pull-5-29-12-v2' into staging
X-Git-Tag: v1.1.0-rc4~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6111501c15972e48b20a60ab0fdd726e84a3ed1;p=thirdparty%2Fqemu.git

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

* mdroth/qga-pull-5-29-12-v2:
  qemu-ga: avoid blocking on atime update when reading /etc/mtab
  qemu-ga: Fix use of environ on Darwin
---

d6111501c15972e48b20a60ab0fdd726e84a3ed1