From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Fri, 8 Jan 2010 21:20:09 +0000 (+0100)
Subject: Merge commit 'origin/master' into new
X-Git-Tag: v1.2.0^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=974363c172e026b00be5f78ec585dda1e402b6f6;p=thirdparty%2Fbird.git

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

974363c172e026b00be5f78ec585dda1e402b6f6