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)
commitcb98235a833bd3e67902ffe4d4a90801c5e75ada
tree62da39ce25136297e84a18b391124155fbb5a063
parent9f96f39ca095a5f450f673e607a72efed504fdad
parentfaa3dec34a67b59fc7e733a2ce3a9d9f2cb34b2d
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 7355055569654f5d4876034fa86fa70d0417dcf8)