From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Sun, 26 Oct 2008 23:20:22 +0000 (+0100)
Subject: Merge branch 'dev' into out
X-Git-Tag: v1.2.0~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a98fbf0f12b5e83e25afa0f585ca6a4d4ac5f6bf;p=thirdparty%2Fbird.git

Merge branch 'dev' into out
---

a98fbf0f12b5e83e25afa0f585ca6a4d4ac5f6bf