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)
commit6993b6139419761c649f3ad54467a2c34f29382d
treefe8a7d092a3078b7a6f633565de7a96e34e00a6d
parentef2e825e1fe5493115d2b271c2f4198e9e5b1f47
parentf963d57096184dd9381fcc5f175150d27460ea7a
Merge branch 'v3-2-test-merge' into v3-2-stable