From: JINMEI Tatuya <jinmei@isc.org>
Date: Mon, 30 Jan 2012 18:24:48 +0000 (-0800)
Subject: [master] Merge branch 'trac1575'
X-Git-Tag: trac2351_base~277
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c421b58e810028b303d328e4e2f5b74ea124839;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1575'
---

2c421b58e810028b303d328e4e2f5b74ea124839