From: Sage Weil <sage@newdream.net>
Date: Tue, 1 Apr 2008 21:39:43 +0000 (-0700)
Subject: Merge commit 'origin/msgr' into unstable
X-Git-Tag: v0.2~229^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03733a7bf8c304a386b21c0bc5dd9f9c76db218e;p=ceph.git

Merge commit 'origin/msgr' into unstable

Conflicts:

	src/start.sh
---

03733a7bf8c304a386b21c0bc5dd9f9c76db218e