Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Sat, 19 Apr 2008 07:59:07 +0000 (09:59 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 19 Apr 2008 07:59:07 +0000 (09:59 +0200)
commit13a0941d3432dc7dae552048265ad1e762b781d4
tree0878f98c01f924c4a2188f2e7af9e989f0af5d48
parente8da1559f7282127264c671c485e812f669b97ba
parent50f6a72b674f58a24c1a6c42e4dd56dc4e9f5a1e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet