From: Sage Weil <sage@inktank.com>
Date: Thu, 20 Jun 2013 19:30:54 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.66~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4bf5b732cd8869276e87d4bbc4f261ee9e0c6a4c;p=ceph.git

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

4bf5b732cd8869276e87d4bbc4f261ee9e0c6a4c