From: Sage Weil <sage@inktank.com>
Date: Thu, 20 Dec 2012 19:07:10 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.57~304
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9f67c450fec3a253b094c8fca3c5a166530366af;p=ceph.git

Merge branch 'next'
---

9f67c450fec3a253b094c8fca3c5a166530366af