Merging from trunk

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