* commit '4d486916':
  cmdutils: Use the correct guard

Conflicts:
	cmdutils.c

See: 35daf3caMerged-by: Michael Niedermayer <michaelni@gmx.at>