Merge branch 'tx6q-1020-devel'
authorLothar Waßmann <LW@KARO-electronics.de>
Wed, 14 May 2014 07:29:24 +0000 (09:29 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 14 May 2014 07:29:24 +0000 (09:29 +0200)

Trivial merge