Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 11:16:40 +0000 (21:16 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 11:16:40 +0000 (21:16 +1000)

Trivial merge