From: Sage Weil <sage@inktank.com>
Date: Sun, 4 Nov 2012 13:06:34 +0000 (-0800)
Subject: Merge branch 'wip-reorg'
X-Git-Tag: v0.55~130^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=004a1fcf8c6130198c2d86aeeda7fafa34360508;p=ceph.git

Merge branch 'wip-reorg'
---

004a1fcf8c6130198c2d86aeeda7fafa34360508