Merge change I882d2eb8 into eclair

* changes:
  do not merge
tree: d32a65f376d6ca31c575b673061f1d518e8fbfb3
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE