From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 13 Mar 2014 15:22:54 +0000 (-0400)
Subject: [master] Merge branch 'trac3374'
X-Git-Tag: kea-eng-20140313~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c641e2d0569df3ca3e5a93beaf0ecf39db07e402;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3374'

Merges in reversion of 3339 and 3373.
---

c641e2d0569df3ca3e5a93beaf0ecf39db07e402