am 4d0bf120: (-s ours) Merge change I08c19bee into eclair

Merge commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe' into eclair-mr2

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