[gnoduino: 199/237] Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot

[Lucian Langa <lucilanga src gnome org>]

commit c678ace8e843fa2abb813e0bb19b6db9b59aa867
Merge: 245afc4 5dbe1f0
Author: Zach Eveland <zeveland blacklabel-development com>
Date:   Thu Oct 27 11:41:02 2011 -0400

    Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot
    
    Conflicts:
    	hardware/arduino/variants/mega/pins_arduino.h
    	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
    	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino

 arduino/cores/arduino/Arduino.h          |    8 +
 arduino/cores/arduino/WString.cpp        |    2 +-
 arduino/cores/arduino/main.cpp           |    1 -
 arduino/cores/arduino/wiring.c           |    4 +
 arduino/cores/arduino/wiring_digital.c   |    1 +
 arduino/variants/mega/pins_arduino.h     |  228 ++++++++---------------------
 arduino/variants/standard/pins_arduino.h |    2 +-
 7 files changed, 78 insertions(+), 168 deletions(-)
---