Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 2 Mar 2008 23:40:01 +0000 (00:40 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 2 Mar 2008 23:40:01 +0000 (00:40 +0100)
commita1ff86dbabff836b95a725d81dc6f325bbc20813
treeb564570cccf80e060128bd8d1a647a2fda111185
parentc7dc53b8514f83800184d2b20b1897e54843a614
parent2db6aec31fe2b106e394dd7027064de4e6951b36
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 3d4cbaeec6eafc0fec06ba472ac2bd55ae3a0d11)