From: Sage Weil <sage@inktank.com>
Date: Thu, 2 May 2013 20:33:54 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.62~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bae62bf31367546ee5f4b462c03747361d6d034c;p=ceph.git

Merge branch 'next'
---

bae62bf31367546ee5f4b462c03747361d6d034c