Merge commit 'origin/v4-0-test' into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jan 2008 22:25:14 +0000 (09:25 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jan 2008 22:25:14 +0000 (09:25 +1100)
commit4720f53a92644dd6959e18923924fbe01889111c
tree2ecb0521718be90ec9828085a2e9abc571f199ae
parent9cd3a76c25019f4d8d7b41d75e1f7efb4475e86a
parentad9089c413bfac6dddda5e837d7143fe7a2c29fb
Merge commit 'origin/v4-0-test' into 4-0-local