starting spirit 3x branch

svn path=; revision=77164
fixing wrong branch

svn path=; revision=77165
starting spirit 3x branch

svn path=; revision=77168
typo fix

svn path=; revision=77225
merge from trunk

svn path=; revision=77244
merge from trunk

svn path=; revision=77245