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

Merge remote branch 'origin/master'
---

ba803bd51cdf3decfc740b3d7287fe51228f78fb