Merge branch 'stable'

Conflicts:
	configure.ac
	debian/changelog
	src/cfuse.cc
	src/rgw/rgw_rest.cc

diff --cc debian/changelog
index 707fc0d82fb8a8c09770e8135bd46fe84460e8ca,0d29a80ea2ef16b10045a33805eca90c04a166a8..734ef4b09217af80486dbcd9555e37d2b0179575
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,17 @@@
-  -- Laszlo Boszormenyi (GCS) <gcs@debian.hu>  Mon, 07 Mar 2011 11:34:02 -0800
++
 +ceph (0.26~rc-1) experimental; urgency=low
 +
 +  * Make ceph x86 and x64 only due to dependency on architecture dependent
 +    google-perftools (closes: #614890).
 +  * Correct section of libcrush1, librados1, librbd1 and libceph1 to libs.
 +
++ -- Laszlo Boszormenyi (GCS) <gcs@debian.hu>  Mon, 21 Mar 2011 11:34:02 -0800
++
+ ceph (0.25.1-1) experimental; urgency=low
+ 
+   * New upstream release 
+ 
+  -- Sage Weil <sage@newdream.net>  Mon, 14 Mar 2011 14:43:47 -0700
  
  ceph (0.25-1) experimental; urgency=low
  

diff --cc src/include/rados/librados.hpp
Simple merge

diff --cc src/librbd.cc
Simple merge

diff --cc src/rados.cc
Simple merge