Merge branch 'master' of ssh://mjb@git.ethernal.org/~/git/altos