Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Tue, 26 Feb 2008 12:07:55 +0000 (13:07 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 26 Feb 2008 12:07:55 +0000 (13:07 +0100)
(This used to be commit 4dab354b626a02e9a5f5cac0d374d18e22718e18)


Trivial merge