From: Sage Weil <sage@inktank.com>
Date: Thu, 1 Nov 2012 00:14:44 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.55~130^2~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=651cbb540e4c102b7e30d9d9caa228bc3454b14e;p=ceph.git

Merge branch 'next'
---

651cbb540e4c102b7e30d9d9caa228bc3454b14e