Ubuntu 12.04 build fixes
Merge branch 'master' of https://github.com/openscad/openscad
Merge branch 'master' of https://github.com/openscad/openscad