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

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

a4db26bc3506542a0cb2d7e7a40cc66530467f13