Merge change I6261ab54 into eclair

* changes:
  Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
tree: 64c0e253499060a3a4c959d62916932cf9251805
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE