Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 04:22:22 +0000 (15:22 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 04:22:22 +0000 (15:22 +1100)
commit2b17949b4210527e64fe2d8c800116f1625f1956
treec75e42b7dc1d07b5747a2abc7f6af52bbb0c6db2
parent48c2d871ea4864fcce47fc5e1fab926ce81de854
parent63bbb9239848beb376d8ffacd787e3fde7cd77e7
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 53b51660ae6b733b19b0ba3403f229b215de7b47)