From: Sage Weil <sage.weil@dreamhost.com>
Date: Sun, 22 Apr 2012 04:01:49 +0000 (-0700)
Subject: Merge branch 'master' into wip-discard
X-Git-Tag: v0.46~22^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be438d6e4e1ced8365b772ff97976e053cbb29ac;p=ceph.git

Merge branch 'master' into wip-discard
---

be438d6e4e1ced8365b772ff97976e053cbb29ac