From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 30 May 2008 10:18:07 +0000 (+0200)
Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-defs
X-Git-Tag: samba-4.0.0alpha4~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b0e0eb346c2f6a240b20fbcf14029539c6512b9;p=thirdparty%2Fsamba.git

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-defs

Conflicts:

	source/samba4-skip
---

7b0e0eb346c2f6a240b20fbcf14029539c6512b9