Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake-simple
authorJelmer Vernooij <jelmer@samba.org>
Wed, 27 Feb 2008 12:17:08 +0000 (13:17 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 27 Feb 2008 12:17:08 +0000 (13:17 +0100)
commite20f1bb6dba342fcc91d3fcf28d64c7d5fd39a38
tree0daf321bd175d97b6813222002f1ebc9160efb42
parent39eb63039163cf7625edf5c0a33112a0659c3eca
parentc9009b9876e14ce9bd9e6941a8344e1f5e47dd21
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake-simple
(This used to be commit a9fe1b785dd59acbfab4eb90256e7a0cb0f4da6e)