Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
authorJelmer Vernooij <jelmer@samba.org>
Sat, 14 Jun 2008 10:15:24 +0000 (12:15 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 14 Jun 2008 10:15:24 +0000 (12:15 +0200)
commit168bb8473c0cfeb388f9955059f92410b8ba5d06
tree535f41e58dee65a3950c4214015e0d5745c48311
parent280c411613b21acc1e65e5657b209d266dbad8d3
parent0e8f946ed02a6d2d9469f9ccab5f3342b2b80725
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir