From: Sage Weil <sage@inktank.com>
Date: Fri, 17 May 2013 03:39:56 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.64~110
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=231a2aa875cf9f1d710c1f5a428d6c86522fa5a7;p=ceph.git

Merge branch 'next'
---

231a2aa875cf9f1d710c1f5a428d6c86522fa5a7