Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 4 Jan 2008 20:59:36 +0000 (12:59 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 4 Jan 2008 20:59:36 +0000 (12:59 -0800)
(This used to be commit 16224e8f4f22a8db0ed278d741a7706967f55335)


Trivial merge