patch against CVS of June 2006