Sync with portage [Sat Oct 19 00:50:45 MSK 2013].
Merge branch 'update' of git://git.calculate.ru/calculate/portage into navsystem

Conflicts:
	kde-misc/customizable-weather/Manifest