Merge branch 'wip-freebsd'

Conflicts:
	src/osd/OSD.cc

diff --cc src/osd/OSD.cc
index f52566e33b599d3d08ea3ca67a5be6fd54168d1c,202965ee0e7535f6d42490ccddc957b2373b28a5..b68f1a46354e2f9ed47aec2aabf50ac6e91d1e94
--- 1/src/osd/OSD.cc
--- 2/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -12,17 -12,6 +12,17 @@@
   * 
   */
  
- #ifdef DARWIN
 +#include <fstream>
 +#include <iostream>
 +#include <errno.h>
 +#include <sys/stat.h>
 +#include <signal.h>
 +#include <boost/scoped_ptr.hpp>
 +
- #endif // DARWIN
++#if defined(DARWIN) || defined(__FreeBSD__)
 +#include <sys/param.h>
 +#include <sys/mount.h>
++#endif // DARWIN || __FreeBSD__
  
  #include "osd/PG.h"