From: Sage Weil <sage@newdream.net>
Date: Fri, 11 Jul 2008 20:30:53 +0000 (-0700)
Subject: Merge branch 'unstable' into snap
X-Git-Tag: v0.4~465
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4674393c8c6d025f67c8b1e038129d40a18d6adb;p=ceph.git

Merge branch 'unstable' into snap
---

4674393c8c6d025f67c8b1e038129d40a18d6adb