From: Sage Weil <sage@inktank.com>
Date: Sat, 15 Jun 2013 04:05:18 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.66~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08c915c87cc95acd663c7cadc0d64dc92806ecea;p=ceph.git

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

08c915c87cc95acd663c7cadc0d64dc92806ecea