Merge branch 'master' of https://git.genivi.org/srv/git/DLT-daemon
authorChristian Muck <q270506@QMUC300924.(none)>
Mon, 12 Sep 2011 15:21:25 +0000 (17:21 +0200)
committerChristian Muck <q270506@QMUC300924.(none)>
Mon, 12 Sep 2011 15:21:25 +0000 (17:21 +0200)

Trivial merge