Merge branch 'master' of https://git.genivi.org/srv/git/AudioManager
authorblacky <blacky@kiwi.(none)>
Tue, 5 Jul 2011 18:54:29 +0000 (20:54 +0200)
committerblacky <blacky@kiwi.(none)>
Tue, 5 Jul 2011 18:54:29 +0000 (20:54 +0200)
commit9eb2402884c520a4d7eaa8ce041618bfaa6930b3
tree35d8457c83321ba0ac5ab0f14b78c7c282f943bc
parent0108869db26775b5e30028b0956adb2007020a10
parent5394c6fa5bf40d9bc8619026cbc4c306211a8499
Merge branch 'master' of https://git.genivi.org/srv/git/AudioManager

Conflicts:
README