Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commitf8e4a675f9ee4bfa4da15c0d6bfb9b8ad24694c8
authorJohn H Terpstra <jht@samba.org>
Fri, 23 May 2008 13:30:52 +0000 (23 08:30 -0500)
committerJohn H Terpstra <jht@samba.org>
Fri, 23 May 2008 13:30:52 +0000 (23 08:30 -0500)
treed396680e92b50cae72c73c0b3716a842d76803e2
parentbc1475b9b90d3427ef06898fa0b284a862c7d719
parent93ca0277e78622081c1a6cab037543187902fd86
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test