Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 9 Feb 2008 03:03:25 +0000 (14:03 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 9 Feb 2008 03:03:25 +0000 (14:03 +1100)
(This used to be commit 774b54141a3549448b7bbc5bc69a661ac525df48)


Trivial merge