Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Thu, 14 Feb 2008 11:03:11 +0000 (12:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 14 Feb 2008 11:03:11 +0000 (12:03 +0100)
commit02af3663a457ebc6aa30e79614e44fb16be8cadd
treec4497d370126fbf328df34e7a1257eac2c58f386
parent21c0f266616e093cccbaf9378b3a915e56ba6079
parentb640f475be9b0f83e7812a5c7756344c5891cba3
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 50697762fd28e2fc77142c5fea528b12d4cc0ebc)