Merge in quagga-0.99.22.4
      merge -r3:6 ../../branches/downloads/quagga