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

Merge branch 'unstable' into io
---

f2e437b92068b82f8ca1388906e56fb4a778d040