am fe17db4c: (-s ours) Merge change I4db11d50 into eclair

Merge commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9' into eclair-mr2

* commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9':
  Backport the change I30b141a2 from MR2 to MR1. Do not merge.
tree: 3da062fcc396979b70df674ed54a91c7b8e4cc7e
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE