Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 20 Jun 2008 09:04:14 +0000 (19:04 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 20 Jun 2008 09:04:14 +0000 (19:04 +1000)

Trivial merge