Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 9 May 2008 00:47:23 +0000 (10:47 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 9 May 2008 00:47:23 +0000 (10:47 +1000)
(This used to be commit 2db0e86fb4abc27eed2d35e1d41122bc89a2c5fe)


Trivial merge