From: Sage Weil <sage@newdream.net>
Date: Sat, 18 Sep 2010 21:08:35 +0000 (-0700)
Subject: Merge branch 'testing' into unstable
X-Git-Tag: v0.22~147
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8de84998b84607e6098776eeb4dc9d56c045425b;p=ceph.git

Merge branch 'testing' into unstable

Conflicts:
	configure.ac
---

8de84998b84607e6098776eeb4dc9d56c045425b