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


Trivial merge