Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Wed, 6 Feb 2008 02:13:33 +0000 (18:13 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 6 Feb 2008 02:13:33 +0000 (18:13 -0800)
(This used to be commit 7b15c75a6bacf783eb73568ed003e4b16d6ebd68)


Trivial merge