Merge branch 'ide-1.5.x-discovery' of https://github.com/arduino/DogStick into ide-1.5.x-discovery

Conflicts:

hardware/arduino/avr/libraries/Bridge/examples/YunSerialTerminal/YunSeri
alTerminal.ino

1 files changed, 1 insertions, 1 deletions

diff --git a/libraries/Bridge/Bridge.h b/libraries/Bridge/Bridge.h
index f85fa07..dbe9c7d 100644
--- a/libraries/Bridge/Bridge.h
+++ b/libraries/Bridge/Bridge.h
@@ -94,7 +94,7 @@ public:
   }
   
   void begin() {
-    serial.begin(115200);
+    serial.begin(57600);
     BridgeClass::begin();
   }