adapting 4 pepper_27
a bug
Makefile etc
patches 4 pnacl
removed ImageMagick-6 include subdir
Merge branch 'master' of https://github.com/kosyak/naclports_samsung-smart-tv

Conflicts:
	ports/imagemagick/nacl.patch