Merge branch 'telemini' of ssh://git.gag.com/scm/git/fw/altos into telemini