Patch by: Ricardo de Almeida Gonzaga <ricardo@profusion.mobi> SVN revision: 83794
SVN revision: 76768