Remove errant debug fprintf
Fix a couple of samsung camera definitions
Merge branch 'master' of https://github.com/darktable-org/darktable into srw-fixes

Conflicts:
	src/external/rawspeed/data/cameras.xml
Merge pull request #652 from pedrocr/srw-fixes

Small fixes for SRW cameras