From: Sage Weil <sage@newdream.net>
Date: Tue, 6 Dec 2011 01:33:57 +0000 (-0800)
Subject: Merge remote branch 'gh/stable'
X-Git-Tag: v0.40~218
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=54758abccf429122c1bc3bce6d01bc33f1cfe238;p=ceph.git

Merge remote branch 'gh/stable'
---

54758abccf429122c1bc3bce6d01bc33f1cfe238