Merge branch 'master' into openbsd_integration
authorMichael Rash <mbr@cipherdyne.org>
Sun, 27 May 2012 01:31:45 +0000 (21:31 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Sun, 27 May 2012 01:31:45 +0000 (21:31 -0400)

Trivial merge