From: Sage Weil <sage@inktank.com>
Date: Mon, 1 Apr 2013 18:52:46 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.62~117
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db7a09507e35132fe89e235caaf356ed6db2fde1;p=ceph.git

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

db7a09507e35132fe89e235caaf356ed6db2fde1