Detail: Merge some whitespace fixes from release.

svn path=/trunk/libs/flyweight/; revision=80349