From: Sage Weil <sage@inktank.com>
Date: Sun, 17 Jun 2012 21:00:02 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.49~83^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=10c57b5ad233bde9963186ff56c72c9072a41a8a;p=ceph.git

Merge branch 'next'
---

10c57b5ad233bde9963186ff56c72c9072a41a8a