Merge commit 'release-4-0-0alpha1' into v4-0-test
authorStefan Metzmacher <metze@samba.org>
Fri, 21 Dec 2007 04:23:22 +0000 (05:23 +0100)
committerStefan Metzmacher <metze@samba.org>
Fri, 21 Dec 2007 04:23:22 +0000 (05:23 +0100)
commitfa7608481a33c9e3907306a5d44bcea94d255f3b
tree8da8928ea334ef4c6cacf977a832eb0886d7c664
parente12a4cb2f38c1f6612fc81690f69056ffdddf004
parentdd5fa4d226ea20d0051f7fd676fbea0e2902789d
Merge commit 'release-4-0-0alpha1' into v4-0-test
(This used to be commit 8fc632baaacf19602e9fc1b5b5dac47082c7ba8b)