Merge remote-tracking branch 'upstream/hmac_support' into hmac_support
authorFranck Joncourt <franck@debian.org>
Wed, 20 Mar 2013 21:33:45 +0000 (22:33 +0100)
committerFranck Joncourt <franck@debian.org>
Wed, 20 Mar 2013 21:33:45 +0000 (22:33 +0100)

Trivial merge