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

[Mike Larson]

 rl_scripts/rtrmgr.init.in |    4 ++++
 1 files changed, 4 insertions(+)

New commits:
commit 573db4ea0a73cbe3ee65f93d90d807f23c4ab3c6
Merge: d1c04ffa63d6b805c5451ee78dfc64cf21a71766 92e75d1c160af5256f288fbfbabac5ad271f8f25
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 1 12:41:42 2006 -0800

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

commit d1c04ffa63d6b805c5451ee78dfc64cf21a71766
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 1 12:41:34 2006 -0800

    Fix for bug 1498--note that we'll want to revisit this after the v1.1 release for a more intelligent location for loading these iptables modules.

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