Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 20 May 2008 01:03:45 +0000 (11:03 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 20 May 2008 01:03:45 +0000 (11:03 +1000)

Trivial merge