Merge change Ic4918c30 into eclair

* changes:
  Fix a build break.  Too many branches to keep track of.
tree: 1226b851c99fd9e2ba193ae29992f403c92d6403
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE