Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 8 Feb 2008 06:20:03 +0000 (17:20 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 8 Feb 2008 06:20:03 +0000 (17:20 +1100)
(This used to be commit ae9d0343e0599ac62c3011a3d6c1948a9cb7a8f1)


Trivial merge