From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 10 Feb 2010 13:59:26 +0000 (+0100)
Subject: Merge commit 'origin/master' into new
X-Git-Tag: v1.2.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fae9be7782a161bdf93c83884d62941a34cbe518;p=thirdparty%2Fbird.git

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

fae9be7782a161bdf93c83884d62941a34cbe518