Merging from trunk

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