Merge branch 'develop' of qmuc300924:/home/git/DLT-daemon into develop
authorChristian Muck <christian.muck@bmw.de>
Tue, 18 Oct 2011 12:01:29 +0000 (14:01 +0200)
committerChristian Muck <christian.muck@bmw.de>
Tue, 18 Oct 2011 12:01:29 +0000 (14:01 +0200)

Trivial merge