Merge remote-tracking branch 'remotes/origin/tx6-bugfix'
authorLothar Waßmann <LW@KARO-electronics.de>
Mon, 30 Jun 2014 13:17:13 +0000 (15:17 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Mon, 30 Jun 2014 13:17:13 +0000 (15:17 +0200)

Trivial merge