Merge change I42a80783 into eclair

* changes:
  Remove deprecated VpnType.getDescription().