Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 08:06:02 +0000 (18:06 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 30 Jun 2008 08:06:02 +0000 (18:06 +1000)
(This used to be commit 757acb6802cfb0e98e91e6062c62b6c5a852302b)


Trivial merge