From: Sage Weil <sage@inktank.com>
Date: Tue, 18 Jun 2013 02:55:55 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.66~56
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5e9a0a140a6474c2f66c61b3d4c21e7a8da2e7c4;p=ceph.git

Merge branch 'next'
---

5e9a0a140a6474c2f66c61b3d4c21e7a8da2e7c4