Merge commit '0ca59ec096a73dfe68a198f1d589ce26ea56df36' as 'platforms/Cross/plugins'
Merge commit '7058f7543f567e56f0ce73d91ef3d8e5d5c45bfd' as 'platforms/win32/plugins'
Merge commit '3ca419841fc84f3660676a403f8541a1ae435354' into merge-svn
updating platforms/win32/plugins
merging with latest svn changes
updating platforms/Cross/plugins
merging with latest svn changes
updating platforms/Cross/plugins
merging with latest svn changes
updating platforms/Cross/plugins
merging with latest svn changes
updating platforms/win32/plugins
updating platforms/Cross/plugins
merging with latest svn changes
updating platforms/Cross/plugins
merging with latest svn changes
updating platforms/Cross/plugins
merging with latest svn changes
updating platforms/Cross/plugins
Merge commit '590a2846ce759c14cb8300e4d3a29a25c2a60c9f' into merge