Merge change 23266 into eclair

* changes:
  disable canceling until the http connection code is understood
tree: 3b30f6de4118e3658f8c505fe479b87479cc23d4
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE