From: ErikZalm <erik@vdzalm.eu>
Date: Sat, 11 Feb 2012 15:36:24 +0000 (-0800)
Subject: Merge pull request #61 from daid/Marlin_v1
X-Git-Tag: iwj-success-2012-07-29~111
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3e7fcb813e54a5d223ec34cbd17f2e8d72367daa;p=marlin.git

Merge pull request #61 from daid/Marlin_v1

Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.
---

3e7fcb813e54a5d223ec34cbd17f2e8d72367daa