From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Thu, 8 Sep 2011 17:51:46 +0000 (-0700)
Subject: Merge branch 'master' into wip-leaks
X-Git-Tag: v0.35~51^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3b0195bf4527ed7972b5f43c3f2171dc7998b898;p=ceph.git

Merge branch 'master' into wip-leaks
---

3b0195bf4527ed7972b5f43c3f2171dc7998b898