Merge commit 'samba/v3-2-test' into v3-2-stable
authorGerald (Jerry) Carter <jerry@samba.org>
Tue, 15 Jan 2008 13:59:23 +0000 (07:59 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Tue, 15 Jan 2008 13:59:23 +0000 (07:59 -0600)
commit061c90fefef0e6093dfc3912d381cc306549ed4b
tree993478f2e1433f6de2f2e21f5bf0421f519a15db
parent5adf38606b4c6918412a3da76e6fb3298ac585af
parenta5fb8b443a7c4ebf68ed005990683718c1092747
Merge commit 'samba/v3-2-test' into v3-2-stable