Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Wed, 27 Feb 2008 12:19:07 +0000 (13:19 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 27 Feb 2008 12:19:07 +0000 (13:19 +0100)
commitbc1a369a0ed254ede591b65756d75568c45549ea
tree9c7fdefdc1d943506752d2d4e15cd4d81f65cc42
parentb3d2a56df29b163d93c4d20efc22c523441a92e5
parente20f1bb6dba342fcc91d3fcf28d64c7d5fd39a38
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

Conflicts:

source/build/smb_build/makefile.pm
(This used to be commit c45b97c4714dd0565949732394c9c1e8eedbb99a)
source4/build/make/rules.mk