Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 14:04:03 +0000 (15:04 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 14:04:03 +0000 (15:04 +0100)
(This used to be commit f7521525e42d62e96cc6f55fb1b23644a60fc36d)


Trivial merge