Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 11 Jan 2008 00:36:05 +0000 (16:36 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 11 Jan 2008 00:36:05 +0000 (16:36 -0800)
(This used to be commit 767e0164adf8803df50b0b7bd8e81d25af72bb78)


Trivial merge