Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Wed, 20 Feb 2008 18:41:52 +0000 (19:41 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 20 Feb 2008 18:41:52 +0000 (19:41 +0100)
commit19bb90a034845c468a76c12ca18f41c5f6c650a5
tree7559b204d9d999ffe0e31d60fbd6852092990036
parent39a6495c86679d5e970012a0d1f5cd375e56450c
parent2c134f3cd5de1851c8cb5900b830cca25892d735
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 54ebd4e353038e86470ad036aa038e18a4296b4b)