Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension

Conflicts:
	build/linux/dist/tools/avrdude.conf

1 files changed, 1 insertions, 1 deletions

diff --git a/cores/arduino/Print.h b/cores/arduino/Print.h
index 8530b03..1af6b72 100755
--- a/cores/arduino/Print.h
+++ b/cores/arduino/Print.h
@@ -46,7 +46,7 @@ class Print
     void clearWriteError() { setWriteError(0); }
   
     virtual size_t write(uint8_t) = 0;
-    virtual size_t write(const char *str);
+    size_t write(const char *str) { return write((const uint8_t *)str, strlen(str)); }
     virtual size_t write(const uint8_t *buffer, size_t size);
     
     size_t print(const __FlashStringHelper *);