Merge branch 'master' of git@git.gromacs.org:gromacs

Pull from main repository on 9/22/09
Conflicts:
	src/gmxlib/enxio.c

diff --cc include/types/enums.h
Simple merge

diff --cc src/gmxlib/enxio.c
Simple merge

diff --cc src/gmxlib/names.c
Simple merge

diff --cc src/gmxlib/pbc.c
Simple merge

diff --cc src/kernel/readir.c
Simple merge

diff --cc src/mdlib/force.c
Simple merge

diff --cc src/mdlib/sim_util.c
Simple merge