Merge branch 'master' into genivi_release 2.0.6 genivi_release_4
authorJohannes Schanda <schanda@itestra.de>
Mon, 27 May 2013 09:47:36 +0000 (11:47 +0200)
committerJohannes Schanda <schanda@itestra.de>
Mon, 27 May 2013 09:47:36 +0000 (11:47 +0200)
Conflicts:
TODO


Trivial merge