Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 25 Jan 2008 00:16:40 +0000 (16:16 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 25 Jan 2008 00:16:40 +0000 (16:16 -0800)

Trivial merge