Fix bug #3907 undefined variables, function parameter problems
Thanks Rasmus Lerdorf for analyzing!
Add changelog entry for bug #3907
Update PHP-gettext to 1.0.11
Merge branch 'QA_4_0' into bug-3907

Conflicts:
	ChangeLog
Merge pull request #379 from mynetx/bug-3907

Fix most analysis results discovered in bug 3907
Fix merge conflicts