Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commita3d5bed503d665ebcb2fa09753b8b0d20d43c7d7
authorJohn H Terpstra <jht@samba.org>
Fri, 6 Jun 2008 19:13:50 +0000 (6 14:13 -0500)
committerJohn H Terpstra <jht@samba.org>
Fri, 6 Jun 2008 19:13:50 +0000 (6 14:13 -0500)
treef426ee1cd6904ae41628c9c1d24a6ec9fea8c40c
parent8ca9c188b55c891ac05f3b2d03b353aef9e962bc
parentbe1d0c90440ad9bbe865fbda80a5e9f112c9e0c0
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test