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 11:04:52 +0000 (22:04 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 11:04:52 +0000 (22:04 +1100)
(This used to be commit 764b7879d23bfa413a6747226f377ce2eaeaea26)


Trivial merge