Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 2 Nov 2007 19:06:15 +0000 (12:06 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 2 Nov 2007 19:06:15 +0000 (12:06 -0700)

Trivial merge