From: Sage Weil <sage@newdream.net>
Date: Wed, 1 Jun 2011 23:28:17 +0000 (-0700)
Subject: Merge branch 'stable' into next
X-Git-Tag: v0.29~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e11958b2fc6eb75ea8921594fcca74b8f839a517;p=ceph.git

Merge branch 'stable' into next
---

e11958b2fc6eb75ea8921594fcca74b8f839a517