[Merge] lp:~timo-jyrinki/qtubuntu/gles-sync-20140808 into lp:qtubuntu/gles

[Timo Jyrinki]

The proposal to merge lp:~timo-jyrinki/qtubuntu/gles-sync-20140808 into lp:qtubuntu/gles has been updated.

Commit Message changed to:

Sync with upstream.

For more details, see:
https://code.launchpad.net/~timo-jyrinki/qtubuntu/gles-sync-20140808/+merge/230101
-- 
https://code.launchpad.net/~timo-jyrinki/qtubuntu/gles-sync-20140808/+merge/230101
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~timo-jyrinki/qtubuntu/gles-sync-20140808 into lp:qtubuntu/gles.