Merge pull request #537 from donaldsharp/vrf_stuff

Vrf stuff

diff --cc bgpd/bgp_attr.c
Simple merge

diff --cc bgpd/bgp_clist.c
Simple merge

diff --cc bgpd/bgp_dump.c
Simple merge

diff --cc bgpd/bgp_main.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc eigrpd/eigrp_dump.c
Simple merge

diff --cc eigrpd/eigrp_filter.c
Simple merge

diff --cc eigrpd/eigrp_hello.c
Simple merge

diff --cc eigrpd/eigrp_interface.c
Simple merge

diff --cc eigrpd/eigrp_main.c
Simple merge

diff --cc eigrpd/eigrp_packet.c
Simple merge

diff --cc eigrpd/eigrp_query.c
Simple merge

diff --cc eigrpd/eigrp_reply.c
Simple merge

diff --cc eigrpd/eigrp_siaquery.c
Simple merge

diff --cc eigrpd/eigrp_siareply.c
Simple merge

diff --cc eigrpd/eigrp_update.c
Simple merge

diff --cc isisd/isis_main.c
Simple merge

diff --cc lib/vrf.c
Simple merge

diff --cc lib/vrf.h
Simple merge

diff --cc lib/zclient.c
Simple merge

diff --cc ospf6d/ospf6_main.c
Simple merge

diff --cc ospfd/ospf_main.c
Simple merge

diff --cc pimd/pim_iface.c
Simple merge

diff --cc pimd/pimd.c
Simple merge

diff --cc ripd/rip_main.c
Simple merge

diff --cc ripngd/ripng_main.c
Simple merge

diff --cc tests/bgpd/test_capability.c
Simple merge

diff --cc tests/bgpd/test_mp_attr.c
Simple merge

diff --cc tests/bgpd/test_mpath.c
Simple merge

diff --cc zebra/if_netlink.c
Simple merge

diff --cc zebra/zebra_vrf.c
Simple merge