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

[Justin Fletcher]

 etc/templates/ospfv2.tp |   46 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 insertions(+), 10 deletions(-)

New commits:
commit 3b5ec6c00a7ff25488615845b5b6651eb2cbcd88
Merge: 0333e7c26cf32ea2c891045d8a10a34d1ea59248 1a33febde779456c9e0f158d277afafcb7c2f269
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Nov 15 14:14:59 2006 -0800

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

commit 0333e7c26cf32ea2c891045d8a10a34d1ea59248
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Nov 15 14:14:20 2006 -0800

    Bug 490: restore rename of OSPF external type policy keyword

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