Merge branch 'tx48-bugfix' into karo-tx-merge
authorLothar Waßmann <LW@KARO-electronics.de>
Mon, 21 Oct 2013 13:36:27 +0000 (15:36 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Mon, 21 Oct 2013 13:36:27 +0000 (15:36 +0200)

Trivial merge