From: Sage Weil <sage.weil@dreamhost.com>
Date: Fri, 6 Apr 2012 19:26:12 +0000 (-0700)
Subject: Merge branch 'stable'
X-Git-Tag: v0.46~117
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ceda94677a354588cc43cea3337b83044990467;p=ceph.git

Merge branch 'stable'
---

2ceda94677a354588cc43cea3337b83044990467