Merge branch 'v4-0-test' of ssh://jra@git.samba.org/data/git/samba into v4-0-test
authorJeremy Allison <jra@samba.org>
Wed, 10 Sep 2008 04:25:03 +0000 (21:25 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 10 Sep 2008 04:25:03 +0000 (21:25 -0700)
(This used to be commit 7cd0977a28e9973ff71e9e0146fef6e6771a72b5)


Trivial merge