From: Sage Weil <sage@inktank.com>
Date: Sun, 25 Nov 2012 17:18:44 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.56~179
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39d2d08a233c81dc6e376f7016ff92f1fb33fa70;p=ceph.git

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

39d2d08a233c81dc6e376f7016ff92f1fb33fa70