From: David Zafman <david.zafman@inktank.com>
Date: Sat, 20 Apr 2013 01:14:28 +0000 (-0700)
Subject: Merge branch 'wip-4201' into next
X-Git-Tag: v0.61~135
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4f8adca837fb9f7271b4fd7dea21b5fcd229c1e;p=ceph.git

Merge branch 'wip-4201' into next

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

c4f8adca837fb9f7271b4fd7dea21b5fcd229c1e