Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 18 Mar 2008 23:18:35 +0000 (10:18 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 18 Mar 2008 23:18:35 +0000 (10:18 +1100)
commitb1b37e3776c6e6e20f42140a907e296b65cc0c62
tree601f049791bcbd9df9daef64b0b1003dbf1a413b
parent9e6b0c28712ee77ce878809c8576826a3ba08d95
parent52669d84722c175555e17a222077f845d9aa958f
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 400c16e7004bc3a881bb6efb99a273cdac87f70c)
source4/heimdal_build/config.mk