From: Sage Weil <sage@newdream.net>
Date: Wed, 23 May 2012 23:41:14 +0000 (-0700)
Subject: Merge branch 'stable'
X-Git-Tag: v0.48argonaut~151^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fbae60315d7d4d2f507ddde8a4de9a173255e080;p=ceph.git

Merge branch 'stable'
---

fbae60315d7d4d2f507ddde8a4de9a173255e080