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

[Mike Larson]

 rl_cmd_proc/command_proc_show_vpn.cc |    8 ++++----
 rl_cmd_proc/xsl/show_vpn_ike_sa.xsl  |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ede197c89011fe691acdff9a4e83856c52bc7479
Merge: af0f716aab3612bb72277cd32b3be073a0852225 2eec5da6e20ba563221746d9afc763aba7d20764
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Feb 5 20:19:50 2007 -0800

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

commit af0f716aab3612bb72277cd32b3be073a0852225
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Feb 5 20:19:13 2007 -0800

    redefine remote/local nodes as right/left in line with openswan convention.

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