Merging from trunk

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