Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 4 Jan 2008 21:24:41 +0000 (13:24 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 4 Jan 2008 21:24:41 +0000 (13:24 -0800)

Trivial merge