Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Sat, 5 Apr 2008 10:35:36 +0000 (21:35 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 5 Apr 2008 10:35:36 +0000 (21:35 +1100)
commit7355055569654f5d4876034fa86fa70d0417dcf8
tree385a406566a24d31474e351b9397ac911f96bdce
parent74480c7de76069701246eb5b7acc5858b84d106c
parent7fccd85cc673c139bc1d57915e0fccd22316998c
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet