Merge main.

diff --cc source/versionInfo.py
index 06d8668,35513af..6359679
--- 1/source/versionInfo.py
--- 2/source/versionInfo.py
+++ b/source/versionInfo.py
@@@ -30,11 -30,10 +30,11 @@@ def _updateVersionFromVCS()
  \r
  name="NVDA"\r
  longName=_("NonVisual Desktop Access")\r
- version="2012.1dev"\r
+ version="2012.2dev"\r
  publisher="unknown"\r
 +updateVersionType=None\r
  try:\r
 -      from _buildVersion import version, publisher\r
 +      from _buildVersion import version, publisher, updateVersionType\r
  except ImportError:\r
        _updateVersionFromVCS()\r
  description=_("A free and open source screen reader for Microsoft Windows")\r