From: Sage Weil <sage@inktank.com>
Date: Wed, 27 Mar 2013 01:19:27 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.62~168
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae993c47c455370a1f660168fc6ff5a6b051fcb8;p=ceph.git

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

ae993c47c455370a1f660168fc6ff5a6b051fcb8