From: Michael Rash <mbr@cipherdyne.org>
Date: Mon, 28 May 2012 18:24:02 +0000 (-0400)
Subject: merged minor updates from master
X-Git-Tag: fwknop-2.5-pre1~277
X-Git-Url: http://www.cipherdyne.com/cgi-bin/gitweb.cgi?p=fwknop.git;a=commitdiff_plain;h=e3761b8bff47600374803443a97493488bc8b4da

merged minor updates from master
---

e3761b8bff47600374803443a97493488bc8b4da