merged rev 4386 from the utf8 branch
merged rev 4386 from the utf8 branch


Chris--A/phpMyFAQ,thorsten/phpMyFAQ,thorsten/phpMyFAQ,rogeriopradoj/phpMyFAQ-vagrant,brianjking/phpMyFAQ,brianjking/phpMyFAQ,Chris--A/phpMyFAQ,thorsten/phpMyFAQ,brianjking/phpMyFAQ,brianjking/phpMyFAQ,thorsten/phpMyFAQ,Chris--A/phpMyFAQ,rogeriopradoj/phpMyFAQ-vagrant,rogeriopradoj/phpMyFAQ-vagrant,Chris--A/phpMyFAQ,rogeriopradoj/phpMyFAQ-vagrant