Merging from trunk

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