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

[Mike Larson]

 rtrmgr/cli.cc              |   17 ++---------------
 rtrmgr/master_conf_tree.cc |    2 +-
 2 files changed, 3 insertions(+), 16 deletions(-)

New commits:
commit 18fb978e93fe9e53812b767586a1a084da634132
Merge: 01addc60f9f1c4eaf93176ee44c5de5c06a91481 aca0b7042c1e8f791d2a2a18e80e1a7a89001638
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Feb 7 15:23:10 2007 -0800

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

commit 01addc60f9f1c4eaf93176ee44c5de5c06a91481
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Feb 7 15:22:55 2007 -0800

    fix for bug 1728

commit a519996bfee1d956b4dea35b2097ad2ea4b6ce5e
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Feb 7 15:22:38 2007 -0800

    fix for bug 1728

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