From: Sage Weil <sage@inktank.com>
Date: Fri, 22 Mar 2013 16:15:52 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.62~189
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0981e4666bd70f191302cd2e6f10c5a7c2d503bd;p=ceph.git

Merge branch 'next'
---

0981e4666bd70f191302cd2e6f10c5a7c2d503bd