Merge change 26720 into eclair

* changes:
  Allow us to set the contact uri without setting the fast track's uri
tree: a27e4a5fb542306244a34ea61eb5cc21cab6690e
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE