Working under windows, VS2010, release now.
Merge branch 'master' into qtOpenGL2