From: Sage Weil <sage@inktank.com>
Date: Tue, 26 Feb 2013 01:48:16 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/wip-4249-master'
X-Git-Tag: v0.59~115
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f1427415c24ce9943d0f18cd566d305832bf316;p=ceph.git

Merge remote-tracking branch 'gh/wip-4249-master'
---

1f1427415c24ce9943d0f18cd566d305832bf316