Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jul 2008 06:15:46 +0000 (16:15 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 23 Jul 2008 06:15:46 +0000 (16:15 +1000)
(This used to be commit 532ccbbe7aa360440f455dfa136f425b9996e998)


Trivial merge