manual merge from trunk: fixed typos reported in http://bugs.debian.org/378016 (NOTE: the html code is quite in bad shape, but I'm not sure whether it is automatically generated; it that case fixing the typo here is probably useless but doesn't hurt either)
Gennaro Prota