Merge branch 'master' into ide-1.5.x

Conflicts:
	hardware/arduino/cores/arduino/wiring.c
	libraries/Ethernet/src/utility/util.h
	libraries/Ethernet/src/utility/w5100.cpp
	libraries/Ethernet/src/utility/w5100.h
	libraries/Ethernet/util.h
	libraries/Ethernet/utility/util.h
	libraries/SPI/SPI.cpp
	libraries/SPI/SPI.h

Author: cmaglie

examples/05.Control/IfStatementConditional/IfStatementConditional.ino

@@ -3,7 +3,7 @@
 
  This example demonstrates the use of if() statements.
  It reads the state of a potentiometer (an analog input) and turns on an LED
- only if the LED goes above a certain threshold level. It prints the analog value
+ only if the potentiometer goes above a certain threshold level. It prints the analog value
  regardless of the level.
 
  The circuit: