Merge branch 'hack-cc1200' of ssh://git.gag.com/scm/git/fw/altos into hack-cc1200