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

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

e4e0ff6a2371ebf3e01feaa4aee3aa29e80c6eb1