missed -amd64 on ubuntu 12.10 template
Merge branch 'fix-box-names'