From: Sage Weil <sage@newdream.net>
Date: Mon, 7 Apr 2008 23:15:54 +0000 (-0700)
Subject: Merge branch 'unstable' into io
X-Git-Tag: v0.3~239^2~81^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d78ed75967c3fa84da1a4bf5e7a2b981fcc9397f;p=ceph.git

Merge branch 'unstable' into io
---

d78ed75967c3fa84da1a4bf5e7a2b981fcc9397f