Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 17 Apr 2008 16:25:45 +0000 (09:25 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 17 Apr 2008 16:25:45 +0000 (09:25 -0700)
(This used to be commit d665cecd8b1b40ad30ec435de0bd925cdea24795)


Trivial merge