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

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

68c11ddd7a726622a06a0828c52fc53a6ca9956f