From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Wed, 23 Mar 2011 20:22:49 +0000 (-0700)
Subject: Merge branch 'master' of ssh://ceph.newdream.net/git/ceph
X-Git-Tag: v0.26~62
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12d3038d81a593949b8b21505dea23c1df38e1c3;p=ceph.git

Merge branch 'master' of ssh://ceph.newdream.net/git/ceph
---

12d3038d81a593949b8b21505dea23c1df38e1c3