Merge branch 'master' of git@qmuc300924:/home/git/DLT-daemon
authorLassi Marttala <lassi.lm.marttala@partner.bmw.com>
Tue, 31 Jan 2012 10:15:16 +0000 (11:15 +0100)
committerLassi Marttala <lassi.lm.marttala@partner.bmw.com>
Tue, 31 Jan 2012 10:15:16 +0000 (11:15 +0100)

Trivial merge