Merge branch 'tx6-bugfix'
authorLothar Waßmann <LW@KARO-electronics.de>
Mon, 16 Jun 2014 16:09:05 +0000 (18:09 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Mon, 16 Jun 2014 16:09:05 +0000 (18:09 +0200)

Trivial merge