Merge branch 'v3-3-test' of git+ssh://sfrench@git.samba.org/data/git/samba into v33
authorSteve French <stevef@smf-t60p.smfdom>
Thu, 24 Jul 2008 14:35:20 +0000 (09:35 -0500)
committerSteve French <stevef@smf-t60p.smfdom>
Thu, 24 Jul 2008 14:35:20 +0000 (09:35 -0500)
(This used to be commit 22afe367fef35d4262d960973933023a0a5ce77d)


Trivial merge