From: Sage Weil <sage@newdream.net>
Date: Tue, 20 Jan 2009 19:19:42 +0000 (-0800)
Subject: Merge branch 'unstable'
X-Git-Tag: v0.6~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=584f8311a6576fa4faf48d29d8cb9928ca4a72cd;p=ceph.git

Merge branch 'unstable'
---

584f8311a6576fa4faf48d29d8cb9928ca4a72cd