From: Sage Weil <sage@inktank.com>
Date: Tue, 26 Feb 2013 00:49:37 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/wip-4147'
X-Git-Tag: v0.59~118
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29642d33c3595c3d6db9c4c364b9ee69663cfc3d;p=ceph.git

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

29642d33c3595c3d6db9c4c364b9ee69663cfc3d