Merge change I4d828c3a into eclair-mr2

* changes:
  QuickContactBadge: Make lookup key query asynchronous.
tree: 16d77dec0083367d176fb64338594a964243d895
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE