Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 00:10:19 +0000 (11:10 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 00:10:19 +0000 (11:10 +1100)
(This used to be commit ddf9d6ef70f0a6b7da420f772b34962fb25d761a)


Trivial merge