Sync with portage [Sat May 10 00:55:06 MSK 2014].
Sync with portage [Sun May 11 11:41:24 MSK 2014].
Sync with portage [Sun May 11 23:22:43 MSK 2014].
Merge branch 'update' of git://git.calculate.ru/calculate/portage into navsystem

Conflicts:
	metadata/md5-cache/sys-block/zram-init-2.7-r1
	profiles/package.mask
	sys-block/zram-init/Manifest
	sys-block/zram-init/metadata.xml
	sys-block/zram-init/zram-init-2.7-r1.ebuild