Merge branch 'stable' into next

Conflicts:
	configure.ac
	debian/changelog
	src/msg/SimpleMessenger.cc

diff --cc debian/changelog
index a434deada11bccb133fa8bc1405dcb8f2263b9ed,c684fef489c3519df0616fb07baba14eb972247f..6b839d7c8488a7dd8f57d32dfac073b58ac19835
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,9 +1,22 @@@
 +ceph (0.26~rc-1) experimental; urgency=low
 +
 +  * Make Ceph Linux only and build on all Linux archs (closes: #614890),
 +    but only build-depend google-perftools on x86 and x64 archs only.
 +  * Correct section of libcrush1, librados1, librbd1 and libceph1 to libs.
 +  * Make Ceph cross buildable (closes: #618939), thanks to Hector Oron.
 +  * Disable libatomic-ops on ARMv4t (armel) archs to prevent FTBFS
 +    (closes: #615235), thanks go to Hector Oron again.
 +  * Rename librados1{,-dbg,-dev} packages to librados2{,-dbg,-dev} ones;
 +    conflict with and replace the former ones.
 +
 + -- Laszlo Boszormenyi (GCS) <gcs@debian.hu>  Fri, 25 Mar 2011 19:42:11 +0100
 +
+ ceph (0.25.2-1) experimental; urgency=low
+ 
+   * New upstream release 
+ 
+  -- Sage Weil <sage@newdream.net>  Sun, 20 Mar 2011 21:07:38 -0700
+ 
  ceph (0.25.1-1) experimental; urgency=low
  
    * New upstream release 

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

diff --cc src/msg/SimpleMessenger.cc
index 467e5a05623a3b0f009189ae92aa5430788cfeb3,0041d8c484805364fd544da80c0006ad8258409d..3fdf2f5daadb32cf77cc21a4e3633b6018d81e33
--- 1/src/msg/SimpleMessenger.cc
--- 2/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@@ -2414,9 -2417,12 +2414,8 @@@ int SimpleMessenger::start(bool daemoni
      lock.Unlock();
      return 0;
    }
-   
 -
    if (!did_bind) {
 -    // NOTE: this is a racy temp fix.  it's fixed for real in v0.26
 -    static uint64_t instance = 0;
 -    ms_addr.nonce = (uint64_t)getpid() + (instance * 1000000ull);
 -    instance++;
 +    ms_addr.nonce = nonce;
    }
  
    dout(1) << "messenger.start" << dendl;