From: Sage Weil <sage@newdream.net>
Date: Fri, 24 Feb 2012 21:00:33 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/stable' into stable
X-Git-Tag: v0.42.2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=321ba67f1bddf623a60ada8623401f7feb6bccee;p=ceph.git

Merge remote-tracking branch 'gh/stable' into stable
---

321ba67f1bddf623a60ada8623401f7feb6bccee