am 80cfc37d: Partial fix for emulator under Lion.

* commit '80cfc37d0f0ddbb7db09b7662b84e816ab409537':
  Partial fix for emulator under Lion.