Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Tue, 12 Feb 2008 01:56:30 +0000 (12:56 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 12 Feb 2008 01:56:30 +0000 (12:56 +1100)
(This used to be commit 3beaa04ef73ca21925d41745b30b6bbaadb7b939)


Trivial merge