Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 14 Dec 2007 00:46:42 +0000 (16:46 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 14 Dec 2007 00:46:42 +0000 (16:46 -0800)
(This used to be commit c9496e97cf91c5f29f19c123377f03f44d1a32f6)


Trivial merge