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 17:03:54 +0000 (18:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 7 Mar 2008 17:03:54 +0000 (18:03 +0100)
(This used to be commit e4da851bd7e7620bbf99efe20a496b1be78ba4e2)


Trivial merge