Sync with portage [Wed Jul  2 13:14:40 MSK 2014].
Sync with portage [Thu Jul  3 13:18:54 MSK 2014].
Sync with portage [Thu Jul  3 22:53:30 MSK 2014].
Sync with portage [Fri Jul  4 12:33:30 MSK 2014].
Sync with portage [Sun Jul  6 01:20:23 MSK 2014].
Sync with portage [Sun Jul  6 16:31:42 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