Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jul 2008 08:07:51 +0000 (18:07 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jul 2008 08:07:51 +0000 (18:07 +1000)

Trivial merge