Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jan 2008 22:55:28 +0000 (09:55 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jan 2008 22:55:28 +0000 (09:55 +1100)
(This used to be commit 588531bf211f5ede2731df56fd540934b673a2d7)


Trivial merge