From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 5 Dec 2012 23:55:35 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.57~347
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=930bb55006aff45f717462b95690d6d0d0fb8150;p=ceph.git

Merge branch 'next'
---

930bb55006aff45f717462b95690d6d0d0fb8150