FL-1492: Fixed 404 and 301 URLs in  and  for sys-boot/boot-update and net-misc/keychain
Updated SRC_URI for sys-boot/grub sys-kernel/genkernel and sys-kernel/sysrescue-std-sources
FL-1492: Added "Package:" for HOMEPAGE of net-misc/keychain and sys-boot/boot-update
Merge remote-tracking branch 'upstream/master' into FL-1492

Conflicts:
	sys-kernel/sysrescue-std-sources/sysrescue-std-sources-2.6.35.210.ebuild
	sys-kernel/sysrescue-std-sources/sysrescue-std-sources-2.6.38.220.ebuild
Replaced www.funtoo.org/distfiles/ by build.funtoo.org/distfiles/
Changed HOMEPAGEs to www.funto.org/Package:
Replace ftp.osuosl.org/pub/funtoo/ by build.funtoo.org/
Merge remote-tracking branch 'apinsard/FL-1492' into mergeme

Conflicts:
	sys-boot/grub/grub-2.00-r7.ebuild