Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jul 2008 10:27:43 +0000 (20:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jul 2008 10:27:43 +0000 (20:27 +1000)
(This used to be commit 7fb8179f214bbba95eb35d221cb9892b55afe121)


Trivial merge