From: Sage Weil <sage@newdream.net>
Date: Tue, 26 Apr 2011 20:40:21 +0000 (-0700)
Subject: Merge remote branch 'origin/stable'
X-Git-Tag: v0.28~139^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7c771108ac61378eff2ee4cc55154ab8b7e7d867;p=ceph.git

Merge remote branch 'origin/stable'
---

7c771108ac61378eff2ee4cc55154ab8b7e7d867