Sync with portage [Tue Sep 23 17:15:59 MSK 2014].
Merge branch 'update' of git://git.calculate.ru/calculate/portage into navsystem

Conflicts:
	profiles/package.mask
Keywords for dropbox-cli
Some keywords change on notebook profile for networkmanager