Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Fri, 11 Apr 2008 04:35:26 +0000 (14:35 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 11 Apr 2008 04:35:26 +0000 (14:35 +1000)
(This used to be commit de5349cc7a5a97c0d2d7288436a4090dfd9bd093)


Trivial merge