Merge branch 'rc' into unstable

Conflicts:
	configure.ac
	src/Makefile.am

diff --cc configure.ac
index 19623f5b76c5f42310abc91004c1984c20e553f8,81336711f59d6cc5c13c6a3da202b0a31dc75061..000e892235035b816951dc2330285e055cd55947
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -160,11 -160,8 +160,12 @@@ AC_CHECK_HEADER([histedit.h]
  AC_CHECK_HEADER([openssl/md5.h],
        [],
        [AC_MSG_ERROR([Sorry you need openssl dev files (libssl-dev on debian)])])
+ PKG_CHECK_MODULES([OPENSSL], [openssl])
  
 +AC_CHECK_HEADER([linux/fiemap.h],
 +      [AC_DEFINE([HAVE_FIEMAP_H], [], [linux/fiemap.h was found, fiemap ioctl will be used])],
 +      [AC_MSG_NOTICE([linux/fiemap.h was not found, fiemap ioctl will not be used])])
 +
  AC_CHECK_HEADERS([sys/xattr.h arpa/inet.h netdb.h netinet/in.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h sys/socket.h sys/statvfs.h sys/time.h sys/vfs.h syslog.h utime.h])
  
  # sync_file_range

diff --cc src/Makefile.am
index 238e5e47f589acb67688d23de4f83ace0d597817,6a566d25a5408673b41575adafbc922802999e3a..dd45ceb5eebcdd24da457c46b6696d765a1f67b8
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -224,9 -225,9 +225,9 @@@ bin_PROGRAMS += testrados testradosp
  endif
  
  radosacl_SOURCES = radosacl.cc
- radosacl_LDADD = librados.la -lpthread -lm -lcrypto
+ radosacl_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS)
 -rbd_SOURCES = rbd.cc
 +rbd_SOURCES = rbd.cc common/fiemap.cc
- rbd_LDADD = librados.la -lpthread -lm -lcrypto
+ rbd_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS)
  bin_PROGRAMS += radosacl rbd
  
  if WITH_RADOSGW

diff --cc src/mds/MDCache.cc
Simple merge

diff --cc src/mds/MDS.cc
Simple merge

diff --cc src/mon/MDSMonitor.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSDMap.h
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osdc/ObjectCacher.h
Simple merge

diff --cc src/osdc/Objecter.cc
Simple merge