From: Sage Weil <sage@inktank.com>
Date: Fri, 8 Feb 2013 17:18:01 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.58~120
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3322e96b7b56678eba7a35ba4fc29cda54d399ae;p=ceph.git

Merge branch 'next'
---

3322e96b7b56678eba7a35ba4fc29cda54d399ae