Merge to git head:
      http://git.savannah.gnu.org/cgit/quagga.git/commit/?id=c78a46c27f6dfdd42fe0800cebabc1e49cb0a4bf