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

[Mike Larson]

 rl_cmd_proc/command_proc_show_vpn.cc  |   16 +++++++++++-----
 rl_cmd_proc/command_proc_show_vpn.hh  |    3 ++-
 rl_cmd_proc/xsl/show_vpn_ike_sa.xsl   |    6 +++---
 rl_cmd_proc/xsl/show_vpn_ipsec_sa.xsl |    4 ++--
 4 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit 0779fa05bba1950511e94cbba4443b907c6ff65f
Merge: 004f6d8db7cba5bac70239b0121c96fed234038c 1ed79c29c9ad78b02bccd86fe97ebf94bba63705
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Feb 8 10:35:00 2007 -0800

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

commit 004f6d8db7cba5bac70239b0121c96fed234038c
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Feb 8 10:34:40 2007 -0800

    Fix for bug 1698--expects the existance of the keylife and ikelifetime values in the ipsec.conf at all times to work.

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