Merge change Id8df149c into eclair

* changes:
  Turn some logging back on in ConnectionManager
tree: 005e2a57c55f5c24400f604150727b9b91b61fe9
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE