From: Josh Durgin <josh.durgin@inktank.com>
Date: Tue, 22 May 2012 19:54:09 +0000 (-0700)
Subject: Merge branch 'stable'
X-Git-Tag: v0.48argonaut~137^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ae59eae3d60dd69b097370514fbbecf42146b66;p=ceph.git

Merge branch 'stable'
---

0ae59eae3d60dd69b097370514fbbecf42146b66