From: Sage Weil <sage@inktank.com>
Date: Wed, 25 Jul 2012 00:22:50 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.51~74
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c3b49072f35ea74e47ea3fa41dc7a29e1e9f073;p=ceph.git

Merge branch 'next'
---

8c3b49072f35ea74e47ea3fa41dc7a29e1e9f073