Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 29 May 2008 21:50:22 +0000 (07:50 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 29 May 2008 21:50:22 +0000 (07:50 +1000)
commitd335fd11637f5e138b08a5e0fcf54b19cef9a646
treefc12f889a48bdf578c36674d5efdb07d361eab22
parenta6d28e2b330a20e95b745966bb5eb153bdc58ed1
parent6b202d3780f8ff50e0bdfa4a749c43b5639e4880
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test