From: Sage Weil <sage@inktank.com>
Date: Mon, 11 Mar 2013 23:57:00 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.60~102
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2a877ad0d182f3d2d8fd969abf1faeef40dd9a7;p=ceph.git

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

f2a877ad0d182f3d2d8fd969abf1faeef40dd9a7