From: Sage Weil <sage@newdream.net>
Date: Fri, 6 Aug 2010 18:34:53 +0000 (-0700)
Subject: Merge branch 'testing' into unstable
X-Git-Tag: v0.22~309
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43638640d61c51585e668c085e7b60eff10b5d2b;p=ceph.git

Merge branch 'testing' into unstable
---

43638640d61c51585e668c085e7b60eff10b5d2b