From: Sage Weil <sage@newdream.net>
Date: Mon, 16 Mar 2009 17:57:23 +0000 (-0700)
Subject: Merge commit '1e8073b75ad5172a1ef975e7c6c42406888f56ae'
X-Git-Tag: v0.7.1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1bcccc3be635abbb04e7ef108ba31dce7d0db90a;p=ceph.git

Merge commit '1e8073b75ad5172a1ef975e7c6c42406888f56ae'

Conflicts:

	src/init-ceph
	src/mkcephfs
---

1bcccc3be635abbb04e7ef108ba31dce7d0db90a