now probably need to consider some module renaming as a result of the merges. but for now that can wait. SVN revision: 59059