Merge remote-tracking branch 'genivi/master'
authorGuy Sagnes <guy.sagnes@continental-corporation.com>
Mon, 1 Sep 2014 10:01:32 +0000 (12:01 +0200)
committerGuy Sagnes <guy.sagnes@continental-corporation.com>
Mon, 1 Sep 2014 10:01:32 +0000 (12:01 +0200)

Trivial merge