Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Wed, 9 Jan 2008 22:35:37 +0000 (14:35 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 9 Jan 2008 22:35:37 +0000 (14:35 -0800)

Trivial merge