Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 13:21:08 +0000 (15:21 +0200)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 13:21:08 +0000 (15:21 +0200)
commit3ab9abf40605a4a6b220faeebaef81546a8d87a0
tree80b570b90fd47275b3b8ce666aba7369fbc97722
parent92d5fb531db39be655f0cbd2d75b5f675a0a4cfa
parenta38f413c557f3c85a5524607c69e9085a8289f47
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test