Sync with portage [Sat May 31 17:01:49 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