Merge pull request #304 from donaldsharp/pim_5549

Pim 5549 Additions

diff --cc pimd/pim_cmd.c
Simple merge

diff --cc pimd/pim_vty.c
Simple merge

diff --cc pimd/pimd.c
Simple merge

diff --cc pimd/pimd.h
index 6c3dcfafcabea50fce4035cd8d2dbec66ed04f7d,7febc38fa7a9539dac084a7cdf7fd90c8dc052e6..ac2a3a408cec5e739a997c289cd6860b95031105
--- 1/pimd/pimd.h
--- 2/pimd/pimd.h
+++ b/pimd/pimd.h
@@@ -247,11 -242,11 +247,14 @@@ struct pim_instanc
  {
    afi_t afi;
    vrf_id_t vrf_id;
 +
 +  enum pim_spt_switchover spt_switchover;
 +
    struct hash *rpf_hash;
+ 
    void *ssm_info; /* per-vrf SSM configuration */
+   
+   int send_v6_secondary;
  };
  
  extern struct pim_instance *pimg; //Pim Global Instance