Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 7 Dec 2007 17:57:19 +0000 (09:57 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 7 Dec 2007 17:57:19 +0000 (09:57 -0800)
(This used to be commit 0c21c5fa84e18d78801ab79abd726e5588902476)


Trivial merge