This fixes some duplicate symbols, once the .o files for the modules were restored into the library (some compilers need the .o files, some don't (!)). Also, remove trailing whitespace. :-) This commit was SVN r32386.