Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commitbc1475b9b90d3427ef06898fa0b284a862c7d719
authorJohn H Terpstra <jht@samba.org>
Wed, 21 May 2008 20:42:37 +0000 (21 15:42 -0500)
committerJohn H Terpstra <jht@samba.org>
Wed, 21 May 2008 20:42:37 +0000 (21 15:42 -0500)
tree848461fc39c1fa6f5d5be1dd707cb489cab60c18
parent6b83aef5c7360480b0d27a5957328566c554d669
parent03a1b791f1ce41f67bf134024bbc8d116b42ea48
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test