Pentax K20D enhanced colormatrix (thanks beowulf)
(cherry picked from commit 6bb2e7236873d30eb078d328a719ac2bc7ef4ce2)
geo: don't install geotagging module when geo is disabled
(cherry picked from commit 6600eea96bcac3628eb58439bcf3f68da1deae28)
lua : make the lua interface to the rest of the world a separate file
Revert "lua : make the lua interface to the rest of the world a separate file"

This reverts commit d667fe022f48239cb13fe331a5ae489a36f02dfc.
[l10n] Swedish update: a couple of fuzzies