Merging from trunk

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