* commit 'bb41115d':
  imgutils: Do not declare avpriv_set_systematic_pal2 in the public header

Conflicts:
	libavutil/internal.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>