Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 15 Feb 2008 02:30:55 +0000 (13:30 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 15 Feb 2008 02:30:55 +0000 (13:30 +1100)
(This used to be commit 9c12b5b49679d404ac623041f2da944019f97754)


Trivial merge