Sync with cvs.sourceforge.net