Made perfmon_result_t::internal_map_t not use a scoped_ptr_t.
Merge branch 'next' into sam_949
Made perfmon_result_t::get_map be private.  Also fixed a debug mode compilation error in perfmon/archive.cc.
Merge branch 'next' into sam_949

Conflicts:
	src/perfmon/core.cc
Merge branch 'next' into sam_949