Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Fri, 7 Mar 2008 22:02:36 +0000 (23:02 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 7 Mar 2008 22:02:36 +0000 (23:02 +0100)
(This used to be commit ac27a1451dfe5c0c957e93fdc84602c3c1c7deac)


Trivial merge