From: christian mueller <christian.ei.mueller@bmw.de>
Date: Tue, 31 Jan 2012 16:51:40 +0000 (+0100)
Subject: Merge branch 'master' of https://git.genivi.org/srv/git/AudioManager
X-Git-Tag: build/2012-06-15.125948~86
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0538d699f441beb81ab64b7f59cb87329667287a;p=profile%2Fivi%2Faudiomanager.git

Merge branch 'master' of https://git.genivi.org/srv/git/AudioManager

Conflicts:
	AudioManagerDaemon/test/routing/routingTest.cpp
	CHANGELOG
	includes/config.h
---

0538d699f441beb81ab64b7f59cb87329667287a