meh
Merge branch 'master' of github.com:a17r/a17rgentoo

Conflicts:
	app-text/libwpg/libwpg-0.3.0.ebuild