Merge branch 'ingo'

Conflicts:
	trunk/lib/installer-exclude/libjitsi.jar

git-svn-id: https://svn.java.net/svn/jitsi~svn/libjitsi@10769 198c5059-ef06-4ec0-9a75-fdd6b0ef00a6