Merge branch 'master' into rgw

Conflicts:

	debian/control

diff --cc configure.ac
Simple merge

diff --cc debian/control
index 7ad94c76e834a374057da416609eb7e7ed5515cf,7fb54e0685b058bd0c9057b0137d74c2c53c27ef..b6f0cf78b334c6fed170aaec214d63992800ecd6
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -6,7 -6,7 +6,7 @@@ Vcs-Git: git://ceph.newdream.net/git/ce
  Vcs-Browser: http://ceph.newdream.net/git/?p=ceph.git;a=summary
  Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
  Uploaders: Sage Weil <sage@newdream.net>
- Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, cdbs, libfuse-dev, libboost-dev, libedit-dev, libcrypto++-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, libgoogle-perftools-dev, pkg-config, libgtkmm-2.4-dev, python, python-dev, libcurl4-gnutls-dev
 -Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, libfuse-dev, libboost-dev, libedit-dev, libcrypto++-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, libgoogle-perftools-dev [i386 amd64], pkg-config, libgtkmm-2.4-dev, python, python-dev
++Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, libfuse-dev, libboost-dev, libedit-dev, libcrypto++-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, libgoogle-perftools-dev [i386 amd64], pkg-config, libgtkmm-2.4-dev, python, python-dev, libcurl4-gnutls-dev
  Standards-Version: 3.9.1
  
  Package: ceph

diff --cc src/Makefile.am
index f830d6b15a0284cbf7312dbbb41b4caf61a1b07f,b944b310deaf974ae320996a526fdc0d47aad972..52367644a10993ef1939053cb60c2e6491db6c3e
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -293,18 -293,10 +293,18 @@@ libradosgw_a_SOURCES = 
        rgw/rgw_access.cc \
        rgw/rgw_op.cc \
        rgw/rgw_rest.cc \
 -      rgw/rgw_common.cc
 +      rgw/rgw_rest_os.cc \
 +      rgw/rgw_rest_s3.cc \
 +      rgw/rgw_common.cc \
 +      rgw/rgw_cache.cc \
 +      rgw/rgw_os.cc \
 +      rgw/rgw_os_auth.cc \
 +      rgw/rgw_formats.cc \
 +      rgw/rgw_log.cc
 +
  libradosgw_a_CFLAGS = ${AM_CFLAGS}
  libradosgw_a_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
- libradosgw_a_LDFLAGS = ${CRYPTO_LDFLAGS} ${AM_LDFLAGS}
+ #libradosgw_a_LDFLAGS = ${CRYPTO_LDFLAGS} ${AM_LDFLAGS}
  # lib_LTLIBRARIES += libradosgw.a
  
  radosgw_SOURCES = rgw/rgw_main.cc

diff --cc src/librados.cc
Simple merge