Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 23:47:18 +0000 (09:47 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 23:47:18 +0000 (09:47 +1000)

Trivial merge