Merge commit '590a2846ce759c14cb8300e4d3a29a25c2a60c9f' into merge
Merge commit '04b4c7662a2e520e6ed349a47700f2db64ccbb14' into merge
Merge commit '1c2293b17792106d0ec8b23dde75dff0119665ee' into merge
Merge commit 'fd56cb23469f56fefe8b84875955cb8607af3df6' into merge
Merge commit '768dc8776305046fa84949b5702a866b8139929d' into merge
Merge commit '0b1fc8ba70bb3b29daccb04be01d180a97af743b' into merge
Merge commit '7122b6422dd70bc188d1f876ee35ee97d7f4e0a1' into merge
Merge commit '57b561bfbf22d8bdfaf28d75fefebe4a770da9c7' into merge
Merge commit '74927ddf02cf4aabc40e6425892a36273030aa07' into merge
Merge commit 'ea7c5aea6f4f6456eb6d1488ca5d5bad3bd15a1f' into merge
Merge commit '24321464aea71cf4d755f2c5a1e5efd60b76a0fd' into merge
Merge commit 'ce0ca4a13f6d732dbcc650203aba73d370ed9117' into merge
Merge commit 'eb434814d930cbceb97d87d992b46a1a4d4566a3' into merge
Merge commit 'b1acdd300bd992a51f7db62c720b836a78ebb7e6' into merge
Merge commit 'ac48286326216e6b374d46581b14dcc0fabcc662' into merge
Merge commit '11d050582ff085fb4fe2a96868d692ad93d0bfa7' into merge
Merge commit '158d1703d02a8fa4902f223231aa2e0bbfb0c9bf' into merge
Merge commit '246f6b8d1f6c90cd90a142c2b2495949a6774086' into merge
merging with latest svn changes
updating platforms/win32/plugins