Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Thu, 1 May 2008 06:41:36 +0000 (16:41 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 1 May 2008 06:41:36 +0000 (16:41 +1000)
(This used to be commit 6bb4c1e6a38a842787177a399bf88f05015f5ec0)


Trivial merge