From: Josh Durgin <josh.durgin@inktank.com>
Date: Thu, 24 May 2012 16:47:41 +0000 (-0700)
Subject: Merge branch 'stable'
X-Git-Tag: v0.48argonaut~151^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ca79f45a33f9c3f200029bf37efa643a59d4f54d;p=ceph.git

Merge branch 'stable'
---

ca79f45a33f9c3f200029bf37efa643a59d4f54d