Merge branch 'refs/heads/fwsnort-1.6.2'
authorMichael Rash <mbr@cipherdyne.org>
Sun, 27 May 2012 17:29:04 +0000 (13:29 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Sun, 27 May 2012 17:29:04 +0000 (13:29 -0400)

Trivial merge