Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 9 Feb 2008 03:13:58 +0000 (14:13 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 9 Feb 2008 03:13:58 +0000 (14:13 +1100)
(This used to be commit 4aff02ecf18d52ae8e64e0c938ac5edf82a6dcef)


Trivial merge