Merge remote branch 'remotes/kc/karo-tx6q' into karo-tx28-devel
authorLothar Waßmann <LW@KARO-electronics.de>
Wed, 24 Jul 2013 10:41:47 +0000 (12:41 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 24 Jul 2013 10:41:47 +0000 (12:41 +0200)

Trivial merge