Merge change I4499ad72 into eclair

* changes:
  Fix bad merge fixes build breakage.
tree: 8665017de55657f88b8d51265c056934aadb89bf
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE