Merge branch 'master' into genivi_release 2.0.0 genivi_release_3
authorJohannes Schanda <schanda@itestra.de>
Thu, 7 Mar 2013 15:16:47 +0000 (16:16 +0100)
committerJohannes Schanda <schanda@itestra.de>
Thu, 7 Mar 2013 15:16:47 +0000 (16:16 +0100)

Trivial merge