Sync with portage [Tue Jun 24 15:59:04 MSK 2014].
Sync with portage [Wed Jun 25 01:45:28 MSK 2014].
Sync with portage [Wed Jun 25 11:06:24 MSK 2014].
Sync with portage [Thu Jun 26 11:17:59 MSK 2014].
Sync with portage [Thu Jun 26 15:03:57 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