From: Tommi Virtanen <tv@hq.newdream.net>
Date: Wed, 12 Jan 2011 18:49:27 +0000 (-0800)
Subject: Merge commit 'e9a70f15029d397ebf0414e5f16fda321af5f55b' into clitests-4
X-Git-Tag: v0.25~332^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=de3b9e7479e3654bce0097a3f8b4da1b97c269b3;p=ceph.git

Merge commit 'e9a70f15029d397ebf0414e5f16fda321af5f55b' into clitests-4
---

de3b9e7479e3654bce0097a3f8b4da1b97c269b3