Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 10:47:52 +0000 (20:47 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 10:47:52 +0000 (20:47 +1000)
(This used to be commit 3731f7eaea6e5ed89d24e383dae0531cb58d77dc)


Trivial merge