From: Sage Weil <sage@inktank.com>
Date: Mon, 20 May 2013 19:22:29 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.64~97
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d37a7bcce44273e5d85cb582efaaad836190b5a3;p=ceph.git

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

d37a7bcce44273e5d85cb582efaaad836190b5a3