Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorGerald (Jerry) Carter <jerry@samba.org>
Fri, 2 Nov 2007 18:16:40 +0000 (14:16 -0400)
committerGerald (Jerry) Carter <jerry@samba.org>
Fri, 2 Nov 2007 18:16:40 +0000 (14:16 -0400)
commit8a33035038d176ca3065daf2ff4f1c93464d5e9c
treedbc3d000567ecded7aeb80fa6eba2d5ea0ffd1fd
parent7bbdc00545ded27f10e87c5b90345bd96d09dfd2
parent414ab2ce46dd62d0119f03eca93783bc489af896
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 95de80218c10a72c7b28541c3c2e475e083b68f1)