scripts/bachroot: Populate the keyring.
scripts/make-repo: Fix i686 support.
Merge branch 'master' into unstable

Conflicts:
	scripts/bachroot