From: Keith Packard <keithp@keithp.com>
Date: Fri, 10 May 2013 04:06:52 +0000 (-0700)
Subject: Merge branch 'master-fixes' into stm-flash-fixes
X-Git-Tag: 1.2.1~19
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=106d212ff5920c39d95751ef6249dc141970412c

Merge branch 'master-fixes' into stm-flash-fixes
---

106d212ff5920c39d95751ef6249dc141970412c