Merge change 25297 into eclair

* changes:
  Address romain's code review comments
tree: f7161062055904cfd149d0cc2c1762160932b987
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE