From: Sage Weil <sage@newdream.net>
Date: Wed, 30 May 2012 18:02:36 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/stable'
X-Git-Tag: v0.48argonaut~155^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b856ace2142876cf882427873c4246f6f9efca5;p=ceph.git

Merge remote-tracking branch 'gh/stable'
---

2b856ace2142876cf882427873c4246f6f9efca5