From: Sage Weil <sage@inktank.com>
Date: Sat, 10 Nov 2012 10:40:33 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.55~134
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b17522d7ae70fc2bbed95eb5f5bf6cc4fd279521;p=ceph.git

Merge branch 'next'
---

b17522d7ae70fc2bbed95eb5f5bf6cc4fd279521