From: Sage Weil <sage@inktank.com>
Date: Tue, 27 Nov 2012 05:13:57 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.56~176
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a41dde3de508cc13ae9253d60ec3b253ec1f2fb6;p=ceph.git

Merge branch 'next'
---

a41dde3de508cc13ae9253d60ec3b253ec1f2fb6