From: Sage Weil <sage@newdream.net>
Date: Tue, 23 Aug 2011 16:25:21 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.35~271
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5e97a1cbfed441f6c80bea36456632b3fe402ccf;p=ceph.git

Merge branch 'next'
---

5e97a1cbfed441f6c80bea36456632b3fe402ccf