Merge change I1f7c409e into eclair

* changes:
  Make ContactStruct handle Collection properly.
tree: c188742a42c23fd9086977572eb27d69268627c2
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE