Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 1 Jul 2008 04:54:23 +0000 (14:54 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 1 Jul 2008 04:54:23 +0000 (14:54 +1000)
(This used to be commit cd5e48649ce0987952b2b55ea79c3ecceecfafd5)


Trivial merge