Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 20 Mar 2008 02:25:05 +0000 (13:25 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 20 Mar 2008 02:25:05 +0000 (13:25 +1100)
(This used to be commit 7c4356084a389c3a4edc16f06906ce6127a3a59b)


Trivial merge