From: Sage Weil <sage@newdream.net>
Date: Wed, 2 Apr 2008 22:36:44 +0000 (-0700)
Subject: Merge branch 'unstable' into io
X-Git-Tag: v0.2~219
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5fdfe55395ef8cf888963cdf8e06ab9e70e5e23b;p=ceph.git

Merge branch 'unstable' into io
---

5fdfe55395ef8cf888963cdf8e06ab9e70e5e23b