Merge branch 'work/v3-2-test' into v3-2-test
authorGerald (Jerry) Carter <jerry@samba.org>
Wed, 2 Jan 2008 23:15:10 +0000 (17:15 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 2 Jan 2008 23:15:10 +0000 (17:15 -0600)
commit761858312b3470ff2acc2980882bad534275c552
tree919d89b7152b1e0824177d1cf2cce5ae0333a557
parent1b06ee69f6b737c1d6e7b29f8ae9621e6eb07d27
parentf22c9d6296c754d472e8eab51caa058f55ef370e
Merge branch 'work/v3-2-test' into v3-2-test