Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jan 2008 23:53:14 +0000 (10:53 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jan 2008 23:53:14 +0000 (10:53 +1100)
(This used to be commit 74220ca244865f97825cabdbc8aa899e71c25c7d)


Trivial merge