Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 17 May 2008 11:16:22 +0000 (21:16 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 17 May 2008 11:16:22 +0000 (21:16 +1000)
(This used to be commit 60579269d1e0bebce5b595ef95d68fd4bf781cfd)


Trivial merge