From: Sage Weil <sage@inktank.com>
Date: Wed, 13 Mar 2013 22:39:01 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.60~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb7cb4a8d62e18505b915aaab44a00fe2b7f2ba9;p=ceph.git

Merge branch 'next'
---

cb7cb4a8d62e18505b915aaab44a00fe2b7f2ba9