From: Greg Farnum <gregf@hq.newdream.net>
Date: Tue, 2 Nov 2010 17:10:24 +0000 (-0700)
Subject: Merge branch 'testing' into unstable
X-Git-Tag: v0.23~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=abb0b6d96610139e14af4ab257a9b5c18a85672e;p=ceph.git

Merge branch 'testing' into unstable
---

abb0b6d96610139e14af4ab257a9b5c18a85672e