Add new features from upstream CVS
    
    - Add upstream patch to support setting SO_MARK for the PPTP TCP control
      connection as well as on the GRE packets
    - Add upstream patch to implement the --nohostroute option
    - Patch to fix broken Call-Disconnect-Notify code accepted upstream
    - Nobody else likes macros for commands