Merge change Ib097fbbf into eclair

* changes:
  DO NOT MERGE  Reverting change I53e91db7.
tree: b4ce2b236ca408f9f1ac1701912b1e686a2d6796
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE