Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 8 Feb 2008 23:00:14 +0000 (10:00 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 8 Feb 2008 23:00:14 +0000 (10:00 +1100)
commit1bf9d0401012cd3c830d50844f5be35e53835322
tree9be4802766b8cfa148a4f8f203c642e30627bbfc
parenta466dda118f785bf784548106637577a5e25a30e
parentcbed074f2841b79cc0f23ad52b1fa34515f706a9
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local