From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Fri, 6 May 2011 20:09:44 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: v1.3.2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46bb7e0d176a4dc0a47bb406988f92fb29cceaf4;p=thirdparty%2Fbird.git

Merge commit 'origin/master'
---

46bb7e0d176a4dc0a47bb406988f92fb29cceaf4