nvda

d5daec54 - Merge branch 'master' into vc2012