Sync with portage [Fri Jul 11 10:07:54 MSK 2014].
Sync with portage [Fri Jul 11 23:20:23 MSK 2014].
Sync with portage [Sun Jul 13 01:46:35 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