Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
commit7a295c66c056bc6eeb26d2176584fff4152b90b8
authorAndrew Bartlett <abartlet@samba.org>
Fri, 27 Jun 2008 02:03:23 +0000 (27 12:03 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 27 Jun 2008 02:03:23 +0000 (27 12:03 +1000)
tree6d18c2cb68f89f36e8085689e282fbf1cbc3e95f
parent1e36856ae50762ebad2d16e81b7ad604509b0d52
parentd4172dac2c122bc2cf5f419d5687168468a9a141
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 9607e79c3db9743617397c347bb69f87f6525801)