Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel