Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 28 Jun 2008 12:04:19 +0000 (22:04 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 28 Jun 2008 12:04:19 +0000 (22:04 +1000)
(This used to be commit 6479f481dbf2f5c83edec0702ece73e83b6c810e)


Trivial merge