add support for custom package database
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Distribution/Pot/MakefileGen.lhs