From: Sage Weil <sage@inktank.com>
Date: Mon, 4 Mar 2013 17:18:28 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/wip-3484'
X-Git-Tag: v0.59~46
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a3f50267aea09109c4a7a8b48a3884fd569a033a;p=ceph.git

Merge remote-tracking branch 'gh/wip-3484'

Reviewed-by: Sage Weil <sage@inktank.com>
---

a3f50267aea09109c4a7a8b48a3884fd569a033a