Merge branch 'master' of https://git.genivi.org/srv/git/DLT-daemon
authorChristian Muck <christian.muck@bmw.de>
Thu, 10 Nov 2011 07:50:03 +0000 (08:50 +0100)
committerChristian Muck <christian.muck@bmw.de>
Thu, 10 Nov 2011 07:50:03 +0000 (08:50 +0100)
commit575fa86ef3181e4ade5a6c341f86bb83558eca93
tree9602a49dce7f85e740ffee68aee7682646661579
parentd34560e81667493a6c7d6a6254d88cf30804bb1c
parent8ecf985d996e8bf0241d75fddce3722f224e5014
Merge branch 'master' of https://git.genivi.org/srv/git/DLT-daemon

Conflicts:
src/shared/dlt_shm.c
src/shared/dlt_shm.c