merge from 3.2

This commit is contained in:
Brian Curtin 2012-02-01 15:15:14 -06:00
commit 8d132c88c2
2 changed files with 3 additions and 3 deletions

View file

@ -475,7 +475,7 @@ def win32_ver(release='',version='',csd='',ptype=''):
""" Get additional version information from the Windows Registry
and return a tuple (version,csd,ptype) referring to version
number, CSD level and OS type (multi/single
number, CSD level (service pack), and OS type (multi/single
processor).
As a hint: ptype returns 'Uniprocessor Free' on single