Sync with portage [Thu Sep 12 23:07:56 MSK 2013].
Merge branch 'update' of git://git.calculate.ru/calculate/portage into navsystem

Conflicts:
	metadata/md5-cache/sys-boot/plymouth-0.8.8