Merge branch 'v3-0-stable' into v3-0-test
authorGerald (Jerry) Carter <jerry@samba.org>
Mon, 10 Dec 2007 15:59:46 +0000 (09:59 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Mon, 10 Dec 2007 15:59:46 +0000 (09:59 -0600)
commit46a780679b87132dbf76af3e684c2124b33a1edc
tree3a94925037f39b28547119784e88fa4c55b4354f
parent452e964995afe5a43040c8bdcadc9c45a1e1d007
parent06160682fba61e97c9837d1c074bb73d449f6e72
Merge branch 'v3-0-stable' into v3-0-test