From: Sage Weil <sage@newdream.net>
Date: Fri, 10 Feb 2012 00:47:15 +0000 (-0800)
Subject: Merge branch 'wip-corpus'
X-Git-Tag: v0.42~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fab2254c1beb4fa1300104298e98d2ad788bded0;p=ceph.git

Merge branch 'wip-corpus'
---

fab2254c1beb4fa1300104298e98d2ad788bded0