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

Merge branch 'stable'
---

be761149f5f829d0aa4bfc65891848efc59f7143