Prefer gstreamer:1.0 in DEPEND for dev-qt/qtwebkit and fix it trying to build against both versions of gst:0.10 and gst:1.0 if gst:1.0 is not detected. Enable 'qml' useflag globally
Merge branch 'master' of git://github.com/shiznix/unity-gentoo

Conflicts:
	dev-qt/qtwebkit/Manifest

a
Tidy ups to unity-base/ubuntuone-control-panel and unity-indicators/indicator-sync
[Saucy] updated keyword file
[Trusty] Mask gnome-extra/polkit-gnome::gentoo and DEPEND on a higher version than in portage tree to force the update. This needs to be autostarted in a Unity desktop session
Merge branch 'master' of https://github.com/shiznix/unity-gentoo
Merge remote-tracking branch 'shiznix/master'

asd
Merge branch 'master' of git://github.com/shiznix/unity-gentoo

a
[Trusty] Add unity-base/unity-control-center to DEPEND for unity-base/gnome-control-center-signon
Merge branch 'master' of git://github.com/shiznix/unity-gentoo

asd
[Trusty] Add unity-base/unity-control-center to DEPEND for gnome-extra/activity-log-manager
Merge branch 'master' of git://github.com/shiznix/unity-gentoo

*
Improve unity-base/unity-language-pack find logic in cases where PORTAGE_TMPDIR has the string 'data'
[Trusty] Use Ubuntu's patchset for dev-qt/qtdeclarative to benefit from QML changes/fixes. Introduce dev-python/u1db and x11-libs/u1db-qt for net-im/friends-app
Update README_trusty_known_issues
Merge branch 'master' of git://github.com/shiznix/unity-gentoo

y
[Trusty] net-im/friends update to ensure backend dbus service files are properly installed
Merge branch 'master' of git://github.com/shiznix/unity-gentoo

update
bump ubuntu-sources-3.13.9_p24_p46.ebuild