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)
commit43ddf12ef9ed400a3116c169700244ea137e593f
treeb1a128d74c7db4883f196ef8f1f79644a64cf43f
parent64e5f2fd8033b14d84d468fde32ac220d82aedb8
parentee8cf0ce40820b3e1ec025339f2b25c0001fda13
Merge commit 'samba/v3-2-test' into v3-2-stable
(This used to be commit 5a527476a07ea43178dc5afeaf8ad78da8a4080c)