Update generation of Windows RC version to properly handle -xxx
extensions to version numbers.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2705