manuall merge customized object mapping subclass object type maps to super class
manuall merge customized object mapping
subclass object type maps to super class


SVN-Revision: 12973

NCIP/cananolab,NCIP/cananolab,NCIP/cananolab