Reported-by: Nuno Gonçalves <nunojpg@gmail.com> SVN-Revision: 24897
* patch by Otto Solares SVN-Revision: 20526