Merge branch 'master' of qmuc300924:/home/git/DLT-daemon
authorChristian Muck <christian.muck@bmw.de>
Wed, 21 Mar 2012 14:40:08 +0000 (15:40 +0100)
committerChristian Muck <christian.muck@bmw.de>
Wed, 21 Mar 2012 14:40:08 +0000 (15:40 +0100)

Trivial merge