From: Sage Weil <sage@newdream.net>
Date: Tue, 3 May 2011 21:28:45 +0000 (-0700)
Subject: Merge branch 'master' into wip_pg_refactor
X-Git-Tag: v0.28~74^2~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a204a60bd8304bc44cf5c61249e39ca0339d729;p=ceph.git

Merge branch 'master' into wip_pg_refactor
---

1a204a60bd8304bc44cf5c61249e39ca0339d729