Fixed issue #469 for both VS 2010 and 2012.
Merge pull request #472 from blackberry/next-469

Fixed issue #469 for both VS 2010 and 2012.