Merge branch 'v4-0-test' into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Fri, 7 Mar 2008 17:59:03 +0000 (18:59 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 7 Mar 2008 17:59:03 +0000 (18:59 +0100)
commit5f2564c386f9c3d1d0b19972a6918597d854cb78
tree8c2467c33ca0960400a9ab47eff8c43a17ca1df4
parente6bcf82c5f0ca9bc750afc16fc1db4913229b2e7
parenta72e921a7ea216d6467ac8b75b4265b4689833ef
Merge branch 'v4-0-test' into v4-0-gmake3
(This used to be commit 2bf43c7932d886b0db3e1c2f5a4b8697435b0c5c)