Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit33f690b3de03dc300590c3f69718f608b104a529
authorGerald (Jerry) Carter <jerry@samba.org>
Sun, 21 Oct 2007 17:39:15 +0000 (21 12:39 -0500)
committerGerald (Jerry) Carter <jerry@samba.org>
Sun, 21 Oct 2007 17:39:15 +0000 (21 12:39 -0500)
tree947a4fdecb7d2dabb450bed0fd272e9ae3b9a7be
parenta62c7f9350322ab435244eafe6053fd5ee618973
parent67328bd27b1e881a4bcdd5160133afa9a267eaac
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test