Merge branch 'ms/aix'

diff --cc AUTHORS
Simple merge

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/disk.c
Simple merge

diff --cc src/interface.c
Simple merge

diff --cc src/load.c
Simple merge

diff --cc src/memory.c
Simple merge

diff --cc src/processes.c
Simple merge

diff --cc src/swap.c
Simple merge