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

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

c86f9239a2fd87dc6021481227864f1316f97c29