Merge branch 'tx51-bugfix'
authorLothar Waßmann <LW@KARO-electronics.de>
Tue, 3 Jun 2014 08:07:19 +0000 (10:07 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 3 Jun 2014 08:07:19 +0000 (10:07 +0200)

Trivial merge