Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox