Merge branch 'master' of qmuc300924:AudioManager
authorFrank Herchet <frank.fh.herchet@bmw.de>
Wed, 29 Feb 2012 13:15:19 +0000 (14:15 +0100)
committerFrank Herchet <frank.fh.herchet@bmw.de>
Wed, 29 Feb 2012 13:15:19 +0000 (14:15 +0100)

Trivial merge