Sync with portage [Sun Jun  8 16:29:28 MSK 2014].
Merge branch 'update' of git://git.calculate.ru/calculate/portage into navsystem