Merging from trunk

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