Merge branch 'v3-2-test-merge' into v3-2-stable
authorGerald W. Carter <jerry@samba.org>
Wed, 16 Jan 2008 16:35:36 +0000 (10:35 -0600)
committerGerald W. Carter <jerry@samba.org>
Wed, 16 Jan 2008 16:35:36 +0000 (10:35 -0600)
commit1a6415fc77c708b87c8e2ce6e7828f486ffc87ac
treefe0dbff696381e5af80342dc7e633297617f3e9e
parent019c245ae15c7fdc414d41f64dad994337f26cf4
parent6e94cbdc30afc3c9b5d2504aa8649fa9c87af7aa
Merge branch 'v3-2-test-merge' into v3-2-stable
(This used to be commit 6993b6139419761c649f3ad54467a2c34f29382d)