Merge change 24464 into eclair

* changes:
  Fix for bug # 2023074: settings db updater broken at version 34.
tree: 2c6139b2aab2402cb9856be7e12b2a4e7a074c2b
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE