From: JINMEI Tatuya <jinmei@isc.org>
Date: Fri, 15 Jun 2012 18:26:45 +0000 (-0700)
Subject: [master] Merge remote-tracking branch 'origin/trac2028'
X-Git-Tag: trac2351_base~226^2~31^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=479e328c6685788093ff7fdece472629f863fd39;p=thirdparty%2Fkea.git

[master] Merge remote-tracking branch 'origin/trac2028'
---

479e328c6685788093ff7fdece472629f863fd39