merged kc master branch
authorLothar Waßmann <LW@KARO-electronics.de>
Fri, 11 Oct 2013 11:26:39 +0000 (13:26 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 11 Oct 2013 11:26:39 +0000 (13:26 +0200)

Trivial merge