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

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

e6cfeb6e2d0b1f540491947ffff8a721ad0e9274