compile under Mac OS X
-lrt is needed by linux
Merge branch 'master' into mdb

* master:
  -lrt is needed by linux
  compile under Mac OS X

Conflicts:
	Makefile
compile under Mac OS X