From: Jelmer Vernooij Date: Mon, 14 Apr 2008 21:30:17 +0000 (+0200) Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4 X-Git-Tag: release-4-0-0alpha6~801^3~339^2~113 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=91baa45dfd3cc56e3b97876d1ec4d6a4b48fbaab;p=amitay%2Fsamba.git Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4 (This used to be commit 0239011ced6c864f85b47a342438228a8f6940ee) --- 91baa45dfd3cc56e3b97876d1ec4d6a4b48fbaab