Merge remote-tracking branch 'mdroth/qga-pull-5-29-12-v2' into staging
commitd6111501c15972e48b20a60ab0fdd726e84a3ed1
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 30 May 2012 07:02:03 +0000 (30 15:02 +0800)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 30 May 2012 07:02:03 +0000 (30 15:02 +0800)
tree9a62891981a2f89dd2a73bf58134bf6aad7471d2
parenteba25057b9a5e19d10ace2bc7716667a31297169
parent9e2fa418fbe71dd472fe5a9cd89ca26d5b594920
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