Replaced a few "auto" variables as GCC4.7 fails to infer the correct type Former-commit-id: 09a0c8dac9
09a0c8dac9