r10372 from sympa svn trunk