Merge change 22822 into eclair

* changes:
  resolved conflicts for merge of b0f5b755 to eclair
tree: b38dd00e41613f1a80e22d6e403d21b7d6fec136
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE