Conflicts:

	configure.ac
	src/Makefile.am
	src/audio/alsalayer.cpp
	src/audio/audiortp.cpp