Sync with portage [Fri Feb 28 11:03:23 MSK 2014].
Sync with portage [Fri Feb 28 18:02:08 MSK 2014].
Sync with portage [Sat Mar  1 21:56:21 MSK 2014].
Sync with portage [Sat Mar  1 22:50:45 MSK 2014].
Merge branch 'update' of git://git.calculate.ru/calculate/portage into navsystem

Conflicts:
	sys-power/upower/upower-0.9.23.ebuild