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)
commit59f5b4c9d72f0bd447f7cca0ebef4821c0cd60df
tree1fa431cd8bae960b649f5e50eab38bbc53d319aa
parent0090ec236d16a2da7b5432083b079034c642a2fc
parent23b3b7c2b3c62f8fdbacb27943f3370407b47857
Merge branch 'work/v3-2-test' into v3-2-test
(This used to be commit 761858312b3470ff2acc2980882bad534275c552)