Fix build on Ubuntu 12.10
Merge branch 'master' of github.com:jsmeredith/EAVL