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

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

467b2d187ddcd1f350d066ce3a79d824b593cdaa