From: Sam Lang <sam.lang@inktank.com>
Date: Fri, 19 Oct 2012 03:14:24 +0000 (-0500)
Subject: Merge branch 'wip-3346'
X-Git-Tag: v0.55~248
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0166bd06c24413d25463545eb2a64959abe173ec;p=ceph.git

Merge branch 'wip-3346'
---

0166bd06c24413d25463545eb2a64959abe173ec