[vyatta-svn] xorp: Changes to 'master'

[Stig Thormodsrud]

 configure.in                       |    1 
 etc/templates/rl_vpn.cmds.in       |    6 ++-
 etc/templates/rl_vpn.tp.in         |    2 -
 rl_scripts/Vyatta.pm.in            |   16 ++++++++-
 rl_scripts/gen_local_rsa_key.pl.in |    2 -
 rl_scripts/include.am              |    1 
 rl_scripts/show_vpn.pl.in          |   62 +++++++++++++++++++++++++++++++++++++
 rl_scripts/vpn-commit.in           |   27 ++++++++++++++++
 rl_scripts/vpn-config.pl.in        |   38 +++++++++++++---------
 9 files changed, 134 insertions(+), 21 deletions(-)

New commits:
commit 312877dbcc278cad324d2bb352074e794587ddc6
Merge: 274d7e93b0bb5827364fbc9f30b781d4c7838c8c 172effb9f4ac8d87e0d98abb8d29777bd311eab7
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Mon Mar 5 17:35:26 2007 -0800

    Merge branch 'master' of suva:/git/xorp

commit 274d7e93b0bb5827364fbc9f30b781d4c7838c8c
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Mon Mar 5 17:35:08 2007 -0800

    Fix "local-key file" such that we can have the rsa key on floppy and survive
    a reboot when running from livecd.
    Add "show vpn rsa-keys".
    Add Vyatta::vpn_debug().
    Add VPL to vpn-commit.

http://suva.vyatta.com/git/?p=xorp.git;a=commitdiff;h=312877dbcc278cad324d2bb352074e794587ddc6