From: David Zafman <david.zafman@inktank.com>
Date: Thu, 25 Apr 2013 00:33:00 +0000 (-0700)
Subject: Merge branch 'wip-4778' into next
X-Git-Tag: v0.61~101
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4804849b7644f2c1dfd92404682f510a88e9a23;p=ceph.git

Merge branch 'wip-4778' into next

Reviewed-by: Samuel Just <sam.just@inktank.com>
---

f4804849b7644f2c1dfd92404682f510a88e9a23