Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 28 Jun 2008 12:04:19 +0000 (22:04 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 28 Jun 2008 12:04:19 +0000 (22:04 +1000)
commit6479f481dbf2f5c83edec0702ece73e83b6c810e
tree5abe1cf1513b2e225bb9e2a26dd5d13bbeeab053
parentc19b28f7579268133939aebe06e1c947d4415182
parent89e90556ec57fce24faf0ed3d6fe262edd974b28
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local