From: David Zafman <david.zafman@inktank.com>
Date: Fri, 26 Apr 2013 20:31:48 +0000 (-0700)
Subject: Merge branch 'wip-4822' into next
X-Git-Tag: v0.61~85
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0c39c1e2139e380977247f1f577be971cc8b6eb;p=ceph.git

Merge branch 'wip-4822' into next

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

e0c39c1e2139e380977247f1f577be971cc8b6eb