Merge branch 'master' of qmuc300924:AudioManager
authorFrank Herchet <frank.fh.herchet@bmw.de>
Wed, 22 Feb 2012 08:43:32 +0000 (09:43 +0100)
committerFrank Herchet <frank.fh.herchet@bmw.de>
Wed, 22 Feb 2012 08:43:32 +0000 (09:43 +0100)

Trivial merge