Merge branch 'master' into ide-1.5.x

cores/arduino/Arduino.h

@@ -120,6 +120,8 @@ typedef uint8_t byte;
 void init(void);
 void initVariant(void);
 
+int atexit(void (*func)()) __attribute__((weak));
+
 void pinMode(uint8_t, uint8_t);
 void digitalWrite(uint8_t, uint8_t);
 int digitalRead(uint8_t);

cores/arduino/main.cpp

@@ -19,6 +19,9 @@
 
 #include <Arduino.h>
 
+//Declared weak in Arduino.h to allow user redefinitions.
+int atexit(void (*func)()) { return 0; }
+
 // Weak empty variant initialization function.
 // May be redefined by variant files.
 void initVariant() __attribute__((weak));