Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 8 Apr 2008 07:31:36 +0000 (17:31 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 8 Apr 2008 07:31:36 +0000 (17:31 +1000)

Trivial merge