From: Sage Weil <sage@inktank.com>
Date: Thu, 13 Jun 2013 22:17:05 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.66~91
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=392e86fbfffb95a0cf492f28756d71f29ed0d851;p=ceph.git

Merge remote-tracking branch 'gh/next'
---

392e86fbfffb95a0cf492f28756d71f29ed0d851