Don't install broken symlinks from source tree for x11-themes/humanity-icon-theme
Adjust net-libs/libsoup and net-libs/libsoup-gnome package deps. again now that it's been split back out
Merge remote-tracking branch 'origin/master'

Conflicts:
	unity-portage.pkeywords