From: Sage Weil <sage@newdream.net>
Date: Thu, 3 Apr 2008 18:08:20 +0000 (-0700)
Subject: Merge branch 'unstable' into io
X-Git-Tag: v0.2~211
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=966072e0efcb1b0433b786d8f3a8c5cc5b780ba2;p=ceph.git

Merge branch 'unstable' into io
---

966072e0efcb1b0433b786d8f3a8c5cc5b780ba2