Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sun, 11 Nov 2007 21:18:22 +0000 (13:18 -0800)
committerJeremy Allison <jra@samba.org>
Sun, 11 Nov 2007 21:18:22 +0000 (13:18 -0800)
(This used to be commit b9d79fb509a6c59fdd73b016be5f4da3435c7789)


Trivial merge