From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Mon, 27 Feb 2012 18:21:02 +0000 (+0100)
Subject: Merge #1534
X-Git-Tag: trac2351_base~226^2~116^2~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff013364643f9bfa736b2d23fec39ac35872d6ad;p=thirdparty%2Fkea.git

Merge #1534

Conflicts:
	src/bin/sockcreator/Makefile.am
---

ff013364643f9bfa736b2d23fec39ac35872d6ad