From: Sage Weil <sage@newdream.net>
Date: Mon, 6 Jun 2011 16:57:41 +0000 (-0700)
Subject: Merge remote branch 'origin/stable' into next
X-Git-Tag: v0.29~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e95ac5a624dcd476c9e9f461d356845fdaef1eb;p=ceph.git

Merge remote branch 'origin/stable' into next
---

4e95ac5a624dcd476c9e9f461d356845fdaef1eb