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

Merge branch 'testing' into unstable
---

8c4d2689076251f8cbc05d426f4c409ac119625c