From: Sage Weil <sage@inktank.com>
Date: Fri, 3 May 2013 18:36:42 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.62~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=378eb32801373c25bd85f6262bee471c3552fb23;p=ceph.git

Merge branch 'next'
---

378eb32801373c25bd85f6262bee471c3552fb23