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

Merge remote branch 'origin/master'
---

dc26699a80eb7b40fb1c9026496cde2b80bf1335