From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 10 Aug 2012 18:36:40 +0000 (+0100)
Subject: update from for-upstream (merge -s theirs)
X-Git-Tag: firmware-tested-2012-08-10^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f0b57ec5b37301dab61595360debab9897a27078;p=marlin.git

update from for-upstream (merge -s theirs)
---

f0b57ec5b37301dab61595360debab9897a27078