From: Sage Weil <sage@inktank.com>
Date: Tue, 12 Feb 2013 01:12:22 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.58~106
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f4d8532ea6f13263845b2bdd3c414e606d819ac;p=ceph.git

Merge remote-tracking branch 'gh/next'
---

3f4d8532ea6f13263845b2bdd3c414e606d819ac