From: Sage Weil <sage@inktank.com>
Date: Wed, 11 Jul 2012 01:21:29 +0000 (-0700)
Subject: Merge branch 'stable' into next
X-Git-Tag: v0.49~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa96e19f4d69876b55cdf9ef41ef7da0b21a8d3d;p=ceph.git

Merge branch 'stable' into next
---

fa96e19f4d69876b55cdf9ef41ef7da0b21a8d3d