From: Sage Weil <sage@newdream.net>
Date: Fri, 23 May 2008 18:35:50 +0000 (-0700)
Subject: Merge branch 'unstable' into nested
X-Git-Tag: v0.3~170^2~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6d31bcd7b97f113e6ca85fb8abaf08171690e7e9;p=ceph.git

Merge branch 'unstable' into nested

nothing added to commit but untracked files present (use "git add" to track)
---

6d31bcd7b97f113e6ca85fb8abaf08171690e7e9