Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 17 May 2008 11:16:22 +0000 (21:16 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 17 May 2008 11:16:22 +0000 (21:16 +1000)
commit60579269d1e0bebce5b595ef95d68fd4bf781cfd
treedde5a74097cd96f910d02027b162a33f6b9bd008
parent8f99a4b94e95f8bde0f80f92d4e57020c62cfaab
parent91e9062265a68e3a1fe5e092503ec44ae5ea034e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local