From: Sage Weil <sage@inktank.com>
Date: Tue, 28 Aug 2012 22:15:08 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.53~253
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0052a78726792472c60bef9bbb9ea46d89d8b0e4;p=ceph.git

Merge branch 'next'
---

0052a78726792472c60bef9bbb9ea46d89d8b0e4