From: Sage Weil <sage@newdream.net>
Date: Tue, 21 Feb 2012 21:43:36 +0000 (-0800)
Subject: Merge branch 'wip-1821'
X-Git-Tag: v0.43~48
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=80d86306f9b5c7826bbe1fad4319f6222a928b4e;p=ceph.git

Merge branch 'wip-1821'

Reviewed-by: Josh Durgin <josh.durgin@dreamhost.com>
---

80d86306f9b5c7826bbe1fad4319f6222a928b4e