From: Paul Jakma <paul@quagga.net>
Date: Tue, 29 Mar 2011 13:25:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/quagga/master'
X-Git-Tag: frr-2.0-rc1~2076
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=74bd8495d0fc3c24e5fba09164093bd6d997771e;p=matthieu%2Ffrr.git

Merge remote-tracking branch 'remotes/quagga/master'
---

74bd8495d0fc3c24e5fba09164093bd6d997771e