Merge change I4e9fe62b into eclair

* changes:
  do not merge -- original checkin to mr2 here:
tree: 1d47eb0d2b8e8a791eb76bfe7f434a671204627c
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE