Changes necessary to compile with Ubuntu 13.10 and the g++ compiler 4.8.1
Authored by: alvarado 2014-02-14
Parent: [r3357]
Child: [r3359]