Merge branch 'hmac_support' into hmac_header_fixes
authorMichael Rash <mbr@cipherdyne.org>
Sat, 2 Mar 2013 03:35:19 +0000 (22:35 -0500)
committerMichael Rash <mbr@cipherdyne.org>
Sat, 2 Mar 2013 03:35:19 +0000 (22:35 -0500)

Trivial merge