Merge remote-tracking branch 'fjoncourt/hmac_support' into hmac_support
authorMichael Rash <mbr@cipherdyne.org>
Fri, 22 Mar 2013 01:58:05 +0000 (21:58 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Fri, 22 Mar 2013 01:58:05 +0000 (21:58 -0400)

Trivial merge