am 03e778b9: Merge change Ic4918c30 into eclair

Merge commit '03e778b913adfb450889c51adf042388ada7c5f8' into eclair-mr2

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