Merge pull request #138 from petemoore/master

Bug 946674 - Building emulator on darwin x86 leads to failure make: *** ...