Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jul 2008 01:27:23 +0000 (11:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jul 2008 01:27:23 +0000 (11:27 +1000)
commit55bde3c9daeafdac04574365c23d181345639f34
tree021ffd3543d4b4d006812476dab6b3329ea7f28b
parent63c80c885dc3fb2228f082be8db752bb29e3962e
parenta4c3a59d47b2b1c794eda556d252c61907be1b3c
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local