Merge tag '1.0.5-r2' into HEAD
Compile with -x assembler-with-cpp instead of -assembler-with-cpp.

- Newer avr-gcc doesn't use -assembler-with-cpp, but
  uses -x assembler-with-cpp. This works with older compilers as well.
Merge pull request #1814 from HeMan/master

Update for newer avr-gcc. (solves https://github.com/arduino/Arduino/issues/1807)
Merge branch 'master' into ide-1.5.x

Conflicts:
	app/src/processing/app/debug/Compiler.java