From: Sage Weil <sage@inktank.com>
Date: Sun, 2 Jun 2013 21:48:04 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.65~169
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44d151388036435b34cd0af3b761ef26de8153b6;p=ceph.git

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

44d151388036435b34cd0af3b761ef26de8153b6