Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 20 Aug 2008 06:02:13 +0000 (16:02 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 20 Aug 2008 06:02:13 +0000 (16:02 +1000)
commitae502f9e3991209d70a745bef3a3e6e7484cdb5f
tree4e7ac3a3655fbcc6646a04d3323af172d8857b05
parent9fa48b3572cb4e55cfaa48a8b516a91904048573
parente860fc171fd127d73df23336089c1479911953da
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet