From: Yehuda Sadeh <yehuda@inktank.com>
Date: Fri, 26 Apr 2013 19:33:03 +0000 (-0700)
Subject: Merge branch 'wip-4760' into next
X-Git-Tag: v0.61~88
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=56ac098b88962a0cbeddfd0fc6cecf03dc4e1df0;p=ceph.git

Merge branch 'wip-4760' into next
---

56ac098b88962a0cbeddfd0fc6cecf03dc4e1df0