From: Sage Weil <sage@newdream.net>
Date: Wed, 11 May 2011 18:42:27 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.29~131
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=151bf29d44a5a35b05ecea3ac5bbfdd8d01aba5e;p=ceph.git

Merge branch 'next'
---

151bf29d44a5a35b05ecea3ac5bbfdd8d01aba5e