Conflicts: configure.ac pmap.c ps/Makefile.am
Reviewed-by: Sami Kerola <kerolasa@iki.fi> Signed-off-by: Jim Warner <james.warner@comcast.net>