From: Sage Weil <sage.weil@dreamhost.com>
Date: Mon, 1 Aug 2011 23:16:38 +0000 (-0700)
Subject: Merge branch 'stable'
X-Git-Tag: v0.33~67
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=09059b73fc0b5e72adc8d3ad686d993d3c52d200;p=ceph.git

Merge branch 'stable'
---

09059b73fc0b5e72adc8d3ad686d993d3c52d200