Sync with portage [Thu Sep 18 11:12:00 MSK 2014].
Sync with portage [Thu Sep 18 15:32:33 MSK 2014].
Sync with portage [Fri Sep 19 10:13:59 MSK 2014].
Sync with portage [Fri Sep 19 15:42:22 MSK 2014].
Sync with portage [Sat Sep 20 22:19:14 MSK 2014].
Sync with portage [Sun Sep 21 12:29:25 MSK 2014].
Sync with portage [Mon Sep 22 01:03:02 MSK 2014].
Sync with portage [Mon Sep 22 10:43:47 MSK 2014].
Sync with portage [Mon Sep 22 14:32:52 MSK 2014].
Sync with portage [Mon Sep 22 22:41:04 MSK 2014].
Sync with portage [Tue Sep 23 00:09:23 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