From: Samuel Just <sam.just@inktank.com>
Date: Wed, 24 Apr 2013 03:49:57 +0000 (-0700)
Subject: Merge branch 'wip_4552' into next
X-Git-Tag: v0.61~111
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d44cfc524fc0844c6027c586090302d45f360efb;p=ceph.git

Merge branch 'wip_4552' into next

Fixes: #4552
Reviewed-by: Greg Farnum <greg@inktank.com>
---

d44cfc524fc0844c6027c586090302d45f360efb