Merge change I137dac6f into eclair

* changes:
  backout a workaround that is not needed anymore
tree: 085930a879bfcfe4c998ae2e76d139fa53864e18
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE