From: Paul Jakma <paul@quagga.net>
Date: Fri, 29 Jul 2011 17:21:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: frr-2.0-rc1~2066
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=538cb284864c17de66152a5236db4cd80e3e7639;p=mirror%2Ffrr.git

Merge remote-tracking branch 'origin/master'
---

538cb284864c17de66152a5236db4cd80e3e7639