Merge branch 'hmac_header_fixes' into hmac_support hmac_header_fixes
authorMichael Rash <mbr@cipherdyne.org>
Sun, 3 Mar 2013 19:36:21 +0000 (14:36 -0500)
committerMichael Rash <mbr@cipherdyne.org>
Sun, 3 Mar 2013 19:36:21 +0000 (14:36 -0500)

Trivial merge