Merging from trunk

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