From: Dan Mick <dan.mick@inktank.com>
Date: Wed, 26 Jun 2013 19:39:15 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.67-rc1~179
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1d902846d8baa6f0d6b49959aaee0ec9d8435fe;p=ceph.git

Merge branch 'next'
---

d1d902846d8baa6f0d6b49959aaee0ec9d8435fe