Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jul 2008 10:27:43 +0000 (20:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jul 2008 10:27:43 +0000 (20:27 +1000)
commit7fb8179f214bbba95eb35d221cb9892b55afe121
tree21c448f58959b5d6144cecc1c8a931105601c5c1
parent6e232c4ae6dc4151599ab4e57add2ec232d4ac13
parent5bde586bdb4a1523a62a764b9ff292a4a8cee4fe
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local