Merge commit 'samba/v3-2-test' into v3-2-stable
authorGerald (Jerry) Carter <jerry@samba.org>
Tue, 15 Jan 2008 16:47:07 +0000 (10:47 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Tue, 15 Jan 2008 16:47:07 +0000 (10:47 -0600)
commit5a527476a07ea43178dc5afeaf8ad78da8a4080c
tree066b76bc209edad2717f69fa140a345786b2bf4f
parent04e0460c7e4adfe29a8c788e1912129c4c0c7e62
parent642424b3779dd33cd2b5049789aa16e678438bb9
Merge commit 'samba/v3-2-test' into v3-2-stable