From: Sage Weil <sage@inktank.com>
Date: Thu, 28 Mar 2013 04:27:16 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.62~152
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe0a0e6fae7c753113960a1a739700441ec75505;p=ceph.git

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

fe0a0e6fae7c753113960a1a739700441ec75505