From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Mon, 10 Aug 2009 08:16:00 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: v1.2.0~37^2~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b92c8e30191dd757c76239076eda82d0065f2348;p=thirdparty%2Fbird.git

Merge branch 'master' into dev
---

b92c8e30191dd757c76239076eda82d0065f2348