From: Sage Weil <sage@newdream.net>
Date: Mon, 12 Dec 2011 17:20:26 +0000 (-0800)
Subject: Merge remote branch 'gh/stable'
X-Git-Tag: v0.40~189
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=62b78de70e84ecfdf75ff67978e978386c722945;p=ceph.git

Merge remote branch 'gh/stable'
---

62b78de70e84ecfdf75ff67978e978386c722945