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

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

Fri, 26 Nov 2010 19:02:21 +0000 (20:02 +0100)

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

Fri, 26 Nov 2010 19:02:21 +0000 (20:02 +0100)
author Jehan Monnier <jehan.monnier@linphone.org>
Fri, 26 Nov 2010 19:02:21 +0000 (20:02 +0100)
committer Jehan Monnier <jehan.monnier@linphone.org>
Fri, 26 Nov 2010 19:02:21 +0000 (20:02 +0100)
diff --cc java/common/org/linphone/core/LinphoneCore.java
Simple merge
author	Jehan Monnier <jehan.monnier@linphone.org>
	Fri, 26 Nov 2010 19:02:21 +0000 (20:02 +0100)
committer	Jehan Monnier <jehan.monnier@linphone.org>
	Fri, 26 Nov 2010 19:02:21 +0000 (20:02 +0100)