nvda

a6b0f9cb - Merge branch 'master' into vc2012