From: Sage Weil <sage@newdream.net>
Date: Thu, 26 May 2011 18:04:03 +0000 (-0700)
Subject: Merge branch 'stable'
X-Git-Tag: v0.29~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9cefb56be817bf911ec151809eb4218878824bb3;p=ceph.git

Merge branch 'stable'
---

9cefb56be817bf911ec151809eb4218878824bb3