From: Sage Weil <sage@newdream.net>
Date: Thu, 28 Apr 2011 00:08:49 +0000 (-0700)
Subject: Merge branch 'master' of ceph.newdream.net:git/ceph
X-Git-Tag: v0.28~139^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a61b51951243d471248216849523623735795b4f;p=ceph.git

Merge branch 'master' of ceph.newdream.net:git/ceph
---

a61b51951243d471248216849523623735795b4f