Merge change I42a80783 into eclair

* changes:
  Remove deprecated VpnType.getDescription().
tree: b60e1508c03b154b0334b3f710e85b147b8a8bb7
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE