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

[Mike Larson]

 rl_serial/rl_serial_node.cc     |    2 +-
 rl_serial/xrl_rl_serial_node.cc |   15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 350d3febf9b38e89b00b1be131a6ea932f51b618
Merge: ff925cbe5bf877fff28c15bcf8a76e087efe4fa3 73428d697469cdad99057170d619348be94e39ba
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Dec 4 21:43:07 2006 -0800

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

commit ff925cbe5bf877fff28c15bcf8a76e087efe4fa3
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Dec 4 21:42:45 2006 -0800

    partial fix for bug 1552--move transaction completion to delete statement for root node. This fixes the error on subsequent configuration of the serial node, but exposes a further error in the serial processing. The interface is restarted on deletion with the old configuration--the net effect is the interface is not torn down.
    
    Also fixed the keep-alive logic for bug 1574.

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