Merged from hodique@lifl.fr--2005 (patch 12-23)