Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 29 May 2008 21:50:22 +0000 (07:50 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 29 May 2008 21:50:22 +0000 (07:50 +1000)
(This used to be commit d335fd11637f5e138b08a5e0fcf54b19cef9a646)


Trivial merge