Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 29 May 2008 21:55:29 +0000 (07:55 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 29 May 2008 21:55:29 +0000 (07:55 +1000)
(This used to be commit cd10b381765f9146f22f5cf23f0ef5f6a65e804d)

1  2 
source4/samba4-skip

Simple merge