From: Sage Weil <sage@newdream.net>
Date: Mon, 1 Aug 2011 16:50:05 +0000 (-0700)
Subject: Merge branch 'stable'
X-Git-Tag: v0.33~73
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a25fd8264d8a925aa9c2a0b34d33f28310598d64;p=ceph.git

Merge branch 'stable'
---

a25fd8264d8a925aa9c2a0b34d33f28310598d64