Sync with portage [Mon Sep  9 01:18:14 MSK 2013].
Merge branch 'update' of git://git.calculate.ru/calculate/portage into navsystem