[Merge] lp:~unity-team/qtubuntu/gles-qtcomp-refactor into lp:qtubuntu/gles

[Gerry Boland]

The proposal to merge lp:~unity-team/qtubuntu/gles-qtcomp-refactor into lp:qtubuntu/gles has been updated.

Commit Message changed to:

Sync with qtubuntu 0.60+14.10.20140724-0ubuntu1

For more details, see:
https://code.launchpad.net/~unity-team/qtubuntu/gles-qtcomp-refactor/+merge/226870
-- 
https://code.launchpad.net/~unity-team/qtubuntu/gles-qtcomp-refactor/+merge/226870
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~unity-team/qtubuntu/gles-qtcomp-refactor into lp:qtubuntu/gles.