Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 07:46:17 +0000 (17:46 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 07:46:17 +0000 (17:46 +1000)
commitce7b1424c711949e6feb0181d3759133b77391ff
tree43a6fb2d933eb4d481a23ae0fe32c523a6c47c92
parentc87d732b23ad7de8dc2f824bf11c9310fb4184e1
parent54b873e49ff363609632fa2862208bf6b4c1b6ed
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local