From: Paul Jakma <paul@quagga.net>
Date: Tue, 28 Jul 2009 15:06:45 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: frr-2.0-rc1~2232
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9afabaf048af74a370dfc71411b6963641f713b2;p=mirror%2Ffrr.git

Merge remote branch 'origin/master'
---

9afabaf048af74a370dfc71411b6963641f713b2