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

Merge branch 'unstable' into io
---

97200c785f5961cc9e05a6718cd1bce0b6118b05