From: Sage Weil <sage@inktank.com>
Date: Thu, 2 May 2013 00:24:40 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-doc-cuttlefish' into next
X-Git-Tag: v0.61~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17c14b251d0b81a7443ce669d86a04dbfeae962e;p=ceph.git

Merge remote-tracking branch 'gh/wip-doc-cuttlefish' into next
---

17c14b251d0b81a7443ce669d86a04dbfeae962e