import geeqie from fedora
er, actually import geeqie from fedora here
Merge branch 'master' into gq-fix

Conflicts:
	SPECS/geeqie.spec