From: Sage Weil <sage@newdream.net>
Date: Mon, 5 Dec 2011 19:21:08 +0000 (-0800)
Subject: Merge branch 'stable'
X-Git-Tag: v0.40~222
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bfbc4324d60714358d5e5be2d0c88a9aeffd35e3;p=ceph.git

Merge branch 'stable'
---

bfbc4324d60714358d5e5be2d0c88a9aeffd35e3