Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 8 Feb 2008 23:00:14 +0000 (10:00 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 8 Feb 2008 23:00:14 +0000 (10:00 +1100)
(This used to be commit 1bf9d0401012cd3c830d50844f5be35e53835322)


Trivial merge