Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Sat, 8 Mar 2008 14:27:32 +0000 (15:27 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 8 Mar 2008 14:27:32 +0000 (15:27 +0100)
(This used to be commit cffaf5f6030b5d9b6d4d802b557fd8ea7afd043d)


Trivial merge