From: Sage Weil <sage@newdream.net>
Date: Thu, 3 Jul 2008 03:41:40 +0000 (-0700)
Subject: Merge branch 'unstable' into snap
X-Git-Tag: v0.4~491
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=529cc6bbc98e48bf1ccca18d8028ca042cb59dd1;p=ceph.git

Merge branch 'unstable' into snap
---

529cc6bbc98e48bf1ccca18d8028ca042cb59dd1