Merge branch 'pyregistry' of git://git.samba.org/jelmer/samba