Fixed compilation issue.

Change-Id: I6abd20989e7cb2a2892d4f3ed2580443efb309a9
Merge branch 'qmmm' of ssh://gerrit.gromacs.org:29418/gromacs into qmmm

Conflicts:
	src/gromacs/qmmm/qmmm.h

Change-Id: I65950a20b920533639e232e8681eb0d8d2871a87