Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 13:26:26 +0000 (15:26 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 13:26:26 +0000 (15:26 +0200)
commit79854f0aa6a9899bb72d302cbca695b8b3a3b0dc
tree49fca9c641b8232ca85e9d1850d533203d12da3d
parent92751a73cd854365d365db854179bfd5aeabe7a2
parentceda3312a98b069d0711f3cb33de3ae71e91ebaa
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet