Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorGerald (Jerry) Carter <jerry@samba.org>
Sun, 21 Oct 2007 17:39:15 +0000 (12:39 -0500)
committerGerald (Jerry) Carter <jerry@samba.org>
Sun, 21 Oct 2007 17:39:15 +0000 (12:39 -0500)
commit6a1a83a85045f78162cbc8840c21dfe968e5cace
tree72746c1055b007fb9f8edd1595a163362629f18c
parent69c6f16e31d0adfc7efb077e09afbb8ff5fb2b0f
parentd1db41c05971b14b16a4dd27df2c5260fcaa5d7f
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 33f690b3de03dc300590c3f69718f608b104a529)