Merge branch 'cleanup'
authorLothar Waßmann <LW@KARO-electronics.de>
Fri, 4 Apr 2014 13:42:07 +0000 (15:42 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 4 Apr 2014 13:42:07 +0000 (15:42 +0200)

Trivial merge