Merging from trunk

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