From: Sage Weil <sage@inktank.com>
Date: Wed, 30 Jan 2013 09:05:07 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.57~77
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b4935023ddad6706fc1c341dbe53578ee3ed3c7;p=ceph.git

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

6b4935023ddad6706fc1c341dbe53578ee3ed3c7