From: Sage Weil <sage@newdream.net>
Date: Tue, 27 May 2008 20:54:00 +0000 (-0700)
Subject: Merge branch 'unstable' into nested
X-Git-Tag: v0.3~170^2~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=656aa02f1cd74af20b9779e900610873d0ee928c;p=ceph.git

Merge branch 'unstable' into nested
---

656aa02f1cd74af20b9779e900610873d0ee928c