Merge change I6cacaa0d into eclair

* changes:
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair
tree: 10d4b58b229952ddba74c998b454b67ce35c5662
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE