Merge change I08c19bee into eclair

* changes:
  DO NOT MERGE: Another gcc 4.0.3 workaround.
tree: cc2aae8a08b6e1429c456596bcbfcba6485b1618
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE