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 11:49:47 +0000 (13:49 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 11:49:47 +0000 (13:49 +0200)
(This used to be commit 92751a73cd854365d365db854179bfd5aeabe7a2)


Trivial merge