Merge branch 'master' into hmac_support
authorMichael Rash <mbr@cipherdyne.org>
Thu, 2 Aug 2012 03:41:00 +0000 (23:41 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Thu, 2 Aug 2012 03:41:00 +0000 (23:41 -0400)

Trivial merge