Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 10:15:12 +0000 (02:15 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 10:15:12 +0000 (02:15 -0800)
(This used to be commit 1d9d39525a1f1f5e43e86d919f1ced2df568f676)


Trivial merge