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

[Mike Larson]

 rl_cmd_proc/command_proc_show_vpn.cc |   43 ++++++++++++++++++++++++++++++-----
 rl_cmd_proc/command_proc_show_vpn.hh |    8 ++++--
 rl_cmd_proc/xsl/show_vpn_ike_sa.xsl  |    6 ++--
 3 files changed, 46 insertions(+), 11 deletions(-)

New commits:
commit 987e68beefe90b28806d04accfb45698dc0925cd
Merge: 4eb22c72e9d2b35c562710e2ecad0d92d7a55816 77ebd4039658753ce30ce8d89963139dfdded4fd
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Sun Feb 11 15:48:37 2007 -0800

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

commit 4eb22c72e9d2b35c562710e2ecad0d92d7a55816
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Sun Feb 11 15:48:13 2007 -0800

    differentate between ike and ipsec state. Now retreiving state from ipsec cmd output. modified ike output to show ike state. Needs more testing on different configurations that will generate different forms of output.

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