merge of 24ccd6df75086f1028c185f4ad5946f449bf2e05
     and cc138b6aed8d554f52f041a11afecb95e95ed3b8

--HG--
branch : libtomcrypt
extra : convert_revision : b699c68f607da9e448ca42b022a7891065781979