Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 26 Mar 2008 04:42:43 +0000 (15:42 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 26 Mar 2008 04:42:43 +0000 (15:42 +1100)
(This used to be commit e1095673089d12e11a4e17a8d6c5b756cc9f427b)


Trivial merge