Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 27 Mar 2008 23:19:21 +0000 (10:19 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 27 Mar 2008 23:19:21 +0000 (10:19 +1100)
(This used to be commit 59d8d17093efac3a177a032f2e121ea6f43a96c8)


Trivial merge