tree 9a62891981a2f89dd2a73bf58134bf6aad7471d2
parent eba25057b9a5e19d10ace2bc7716667a31297169
parent 9e2fa418fbe71dd472fe5a9cd89ca26d5b594920
author Anthony Liguori <aliguori@us.ibm.com> 1338361323 +0800
committer Anthony Liguori <aliguori@us.ibm.com> 1338361323 +0800

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