Merging from trunk

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