Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Tue, 4 Mar 2008 13:16:57 +0000 (14:16 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 4 Mar 2008 13:16:57 +0000 (14:16 +0100)
commit391fea450b2e6664fcd4e4419858997c6094cf3e
tree0ecd8554b65c47456bae9c19fc62e382861a2adc
parent9d751319bd4ca1c26c8bd01cbdfdaf6c2d949981
parentb0ecd8f8d2c1ebf23957921f4852e90b556812fc
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

Conflicts:

source/build/smb_build/makefile.pm
source/Makefile