[gnoduino: 192/237] Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot

[Lucian Langa <lucilanga src gnome org>]

commit 9f0786a91ec661dfc08bc9e77b2e04e556a669c4
Merge: cc6c9c3 ad68ead
Author: Zach Eveland <zeveland blacklabel-development com>
Date:   Thu Oct 27 09:32:27 2011 -0400

    Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot
    
    Conflicts:
    	app/src/processing/app/Editor.java
    	app/src/processing/app/Sketch.java
    	build/shared/examples/4.Communication/SerialCallResponse/SerialCallResponse.pde
    	build/shared/lib/theme/theme.txt
    	hardware/arduino/cores/arduino/HardwareSerial.h
    	hardware/arduino/cores/arduino/Print.cpp
    	hardware/arduino/cores/arduino/WString.h
    	hardware/arduino/variants/mega/pins_arduino.h
    	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
    	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
    	libraries/Firmata/examples/EchoString/EchoString.ino
    	libraries/SD/File.cpp
    	libraries/SoftwareSerial/SoftwareSerial.cpp
    	libraries/SoftwareSerial/SoftwareSerial.h
    	libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
    	libraries/SoftwareSerial/keywords.txt

 arduino/boards.txt                                 |    2 +-
 arduino/bootloaders/stk500v2/stk500boot.c          |    3 +-
 .../stk500v2/stk500boot_v2_mega2560.hex            |  648 +++++---------------
 arduino/cores/arduino/HardwareSerial.h             |   14 +-
 arduino/cores/arduino/Print.cpp                    |  207 +++----
 arduino/cores/arduino/WString.h                    |  255 +++------
 arduino/variants/mega/pins_arduino.h               |  228 +++++--
 7 files changed, 474 insertions(+), 883 deletions(-)
---
diff --cc arduino/variants/mega/pins_arduino.h
index 237173a,62e10ad..62e10ad
mode 100644,100755..100755
--- a/arduino/variants/mega/pins_arduino.h
+++ b/arduino/variants/mega/pins_arduino.h