From: Sage Weil <sage@newdream.net>
Date: Fri, 24 Feb 2012 21:22:49 +0000 (-0800)
Subject: Merge branch 'stable'
X-Git-Tag: v0.43~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=008ce6b2d471dbef27cb24fad90d512cbf35bc1b;p=ceph.git

Merge branch 'stable'
---

008ce6b2d471dbef27cb24fad90d512cbf35bc1b