Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Jun 2008 17:18:48 +0000 (19:18 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 15 Jun 2008 17:18:48 +0000 (19:18 +0200)
commit1659a572c49b2f9cf336b27ec1c1bec1b86d688e
tree4aaeb4c25ecd02e8d4ccdaa0d727bd94fefe20fe
parent4ac91e301455721b76f7f456bc50c5c6e47c05d3
parentb32a040c2f0eb28d68837bde727437ca118d1b18
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir