From: Sage Weil <sage@newdream.net>
Date: Thu, 19 Aug 2010 17:47:19 +0000 (-0700)
Subject: Merge branch 'testing' into unstable
X-Git-Tag: v0.22~251
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fcea7d96e090f043ceef4d0c90d254c367ac05b5;p=ceph.git

Merge branch 'testing' into unstable
---

fcea7d96e090f043ceef4d0c90d254c367ac05b5