From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 21 Apr 2010 19:52:10 +0000 (+0200)
Subject: Merge commit 'origin/master' into new
X-Git-Tag: v1.2.3~20^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d44ddf20f3ecef864d4bd20355251839fcd10ee;p=thirdparty%2Fbird.git

Merge commit 'origin/master' into new
---

1d44ddf20f3ecef864d4bd20355251839fcd10ee