Code

Fixes for Mac OS X packaging for 0.47: