merging latest from cvs @ sf.net