[1.48.06]
Language changes: en, hi.
Changes to en-us phonemes [aI] [aI@] [aI&]


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@378 d46cf337-b52f-0410-862d-fd96e6ae7743
Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
1.48.06 (from http://espeak.sourceforge.net/test/latest.html)
Merge branch 'development'
configure.ac: allow setting the wx-config path
eSpeak for Android 1.48.05
Merge branch 'master' into android