Merging from trunk

svn path=/branches/release/libs/fusion/; revision=84745