Merge branch 'master' of qmuc300924:AudioManager
authorchristian mueller <christian.ei.mueller@bmw.de>
Fri, 23 Mar 2012 09:17:47 +0000 (10:17 +0100)
committerchristian mueller <christian.ei.mueller@bmw.de>
Fri, 23 Mar 2012 09:17:47 +0000 (10:17 +0100)

Trivial merge