From: Paul Jakma <paul@quagga.net>
Date: Tue, 2 Jun 2009 18:43:51 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: frr-2.0-rc1~2334
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6e0989e113d9e2268e58cfe29922e971793c1d06;p=matthieu%2Ffrr.git

Merge remote branch 'origin/master'
---

6e0989e113d9e2268e58cfe29922e971793c1d06