Merge branch 'master' of ssh://code.quagga.net/var/git/quagga