Merge branch 'master' of david@pixies:/shared/pub/ugit