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

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

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

b271b656a889b14d052f0f354ade4e5e68c6740f