starting spirit 3x branch

SVN-Revision: 77163
starting spirit 3x branch

SVN-Revision: 77164
fixing wrong branch

SVN-Revision: 77165
fixing wrong branch

SVN-Revision: 77167
starting spirit 3x branch

SVN-Revision: 77168
typo fix

SVN-Revision: 77225
merge from trunk

SVN-Revision: 77244
merge from trunk

SVN-Revision: 77245