From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 18 Jul 2012 19:58:47 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.50~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d0b468914a9776ccab9920d16f2f7b34f60e759;p=ceph.git

Merge branch 'next'
---

0d0b468914a9776ccab9920d16f2f7b34f60e759