merged with svn sources from Eliot branch (revision 3143)
merged with VMMaker.oscog-tpr.949
merged with Cog-eem.222