macosx build
Merge branch 'master' of git://github.com/eax/Replicant

* 'master' of git://github.com/eax/Replicant:
  macosx build