Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 10 Jun 2008 03:19:56 +0000 (13:19 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 10 Jun 2008 03:19:56 +0000 (13:19 +1000)

Trivial merge