Merge branch 'master' of git.linphone.org:linphone-private

author Jehan Monnier <jehan.monnier@linphone.org>

Thu, 7 Oct 2010 14:54:59 +0000 (16:54 +0200)

committer Jehan Monnier <jehan.monnier@linphone.org>

Thu, 7 Oct 2010 14:54:59 +0000 (16:54 +0200)
author Jehan Monnier <jehan.monnier@linphone.org>
Thu, 7 Oct 2010 14:54:59 +0000 (16:54 +0200)
committer Jehan Monnier <jehan.monnier@linphone.org>
Thu, 7 Oct 2010 14:54:59 +0000 (16:54 +0200)
diff --cc configure.ac
Simple merge
diff --cc coreapi/linphonecore.h
Simple merge
author	Jehan Monnier <jehan.monnier@linphone.org>
	Thu, 7 Oct 2010 14:54:59 +0000 (16:54 +0200)
committer	Jehan Monnier <jehan.monnier@linphone.org>
	Thu, 7 Oct 2010 14:54:59 +0000 (16:54 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	patch \|	diff1 \|	diff2 \|	blob \| history