Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Mon, 15 Oct 2007 23:12:01 +0000 (16:12 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 15 Oct 2007 23:12:01 +0000 (16:12 -0700)
(This used to be commit 5c8adce3f368d51a67d74ae168a0f59a20e1d64c)


Trivial merge