Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 17:05:09 +0000 (18:05 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 17:05:09 +0000 (18:05 +0100)
(This used to be commit 02cb396d42976efc03fcb0082e914eb17ae72e11)


Trivial merge