Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 10 Jan 2008 01:08:20 +0000 (17:08 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 10 Jan 2008 01:08:20 +0000 (17:08 -0800)
(This used to be commit f98c68a8a4882cb0a1b7e8985f3eba5ebb8287e3)


Trivial merge