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

[Stig Thormodsrud]

 rl_scripts/Vyatta.pm.in     |    4 +++-
 rl_scripts/vpn-config.pl.in |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit bf20369ef583a615f09fa6f6d0b139f6e3cae91d
Merge: 58ab0e5f72344e1c68558e53820ef67e81520cff cbf68657ffab43e87c49486d2b24f670eac34001
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Tue Feb 6 17:45:04 2007 -0800

    Merge branch 'master' of git://git.vyatta.com/xorp

commit 58ab0e5f72344e1c68558e53820ef67e81520cff
Author: Stig Thormodsrud <stig at vyatta.com>
Date:   Tue Feb 6 17:39:55 2007 -0800

    Allow vif's to be configured for VPN (bug 1716).

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