merged from trunk

svn path=/branches/proto/v4/libs/property_map/; revision=45289
merged from trunk

svn path=/branches/proto/v4/libs/property_map/; revision=49607