Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Sat, 5 Apr 2008 10:35:36 +0000 (21:35 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 5 Apr 2008 10:35:36 +0000 (21:35 +1100)

Trivial merge