Merge with cvs.sourceforge.net