From: Sage Weil <sage@inktank.com>
Date: Wed, 6 Feb 2013 18:38:08 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/wip-3768'
X-Git-Tag: v0.58~138
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0aea4dba040b8caaeb5c4079728078541e5bb2c1;p=ceph.git

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

0aea4dba040b8caaeb5c4079728078541e5bb2c1