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

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

bbdefe34875b99de8e11a50ffe925d5148634917