From: Greg Farnum <gregf@hq.newdream.net>
Date: Fri, 13 Nov 2009 00:45:05 +0000 (-0800)
Subject: Merge branch 'unstable' of ceph.newdream.net:/git/ceph into unstable
X-Git-Tag: v0.18~98^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2303a33e77b02bf1937d3e104fff924c0250c3f5;p=ceph.git

Merge branch 'unstable' of ceph.newdream.net:/git/ceph into unstable
---

2303a33e77b02bf1937d3e104fff924c0250c3f5