Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 20 Aug 2008 06:02:13 +0000 (16:02 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 20 Aug 2008 06:02:13 +0000 (16:02 +1000)
commite7db2325e9beaf4a329c4b7274c998b5952073b6
tree02f8f00690b9af2eaf2ca66ca14853382d7ecbd6
parent4bfab3bedbf36979424e3d284e8bd67c8224d47b
parent9dffeab5a8770de7c97e1b4e88fda372e5760147
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit ae502f9e3991209d70a745bef3a3e6e7484cdb5f)