From: Sage Weil <sage@inktank.com>
Date: Tue, 23 Jul 2013 18:23:24 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next' into next
X-Git-Tag: v0.67-rc2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0709ef5edab956b014f4f56c19868d08aea6cc9;p=ceph.git

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

e0709ef5edab956b014f4f56c19868d08aea6cc9