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)
commita9fe1b785dd59acbfab4eb90256e7a0cb0f4da6e
treed4de3c8c298f9d0f37986ce237e95abd60271580
parentf34a17a92bcc9a27b629a6ec9ed9a818bd13acc0
parentff311e613226e660998824b887cb9595ffbe0275
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake-simple