Merge branch 'v4-0-test' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 29 Mar 2008 03:14:25 +0000 (14:14 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 29 Mar 2008 03:14:25 +0000 (14:14 +1100)
(This used to be commit f39af7c2c35abb794e1dc1a496c1960221f006f2)


Trivial merge