Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
authorJeremy Allison <jra@samba.org>
Fri, 8 Aug 2008 21:33:55 +0000 (14:33 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 8 Aug 2008 21:33:55 +0000 (14:33 -0700)
(This used to be commit 5b3579b14cd5ea6e67ff3c91f5bed155d944c049)


Trivial merge