Nicolas Schodet 7851515c5c Fix merge error ...

This line was removed in commit acc276a612, but it has been restored in the
merge 02ea612142.

2012-09-17 17:27:50 -07:00

..

libopencm3

Fix merge error

2012-09-17 17:27:50 -07:00