Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Fri, 25 Apr 2008 08:24:12 +0000 (09:24 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 25 Apr 2008 08:24:12 +0000 (09:24 +0100)
commit28c29e7ad364a5e0a3aaa91d2dfd4400596ac691
treed81b874e2e599a52d621106e2150e12e73f4d559
parentd67e47e5cd11c928299dc03ce2ff521e2d3cca83
parent240d959005f5fd80a38b3734b39dd5d6e425a566
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 2c3a3d0134b5fe4cd9dfdb05d1b140b2c9b502f1)