From: Sage Weil <sage@inktank.com>
Date: Mon, 8 Jul 2013 04:20:34 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.67-rc1~145
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8bc50626c51c9d45017cb0fed1f542ec7706323f;p=ceph.git

Merge branch 'next'
---

8bc50626c51c9d45017cb0fed1f542ec7706323f