From: Sage Weil <sage@inktank.com>
Date: Fri, 1 Mar 2013 00:58:02 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.59~56
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=862c761554e9f54dc4cd8defc10c4cd11d3ba75f;p=ceph.git

Merge branch 'next'
---

862c761554e9f54dc4cd8defc10c4cd11d3ba75f