From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 5 Apr 2016 10:53:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-04-05-1' into... 
X-Git-Tag: TizenStudio_2.0_p2.4~27^2~6^2~8^2~65
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a226f7653620f8c5b570ca63c26df98bdc1d84c4;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-04-05-1' into staging

Merge QCrypto fixes 2016/04/05 v1

# gpg: Signature made Tue 05 Apr 2016 10:53:59 BST using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"

* remotes/berrange/tags/pull-qcrypto-2016-04-05-1:
  crypto: fix nettle config check for running pbkdf test
  crypto: fix typo in docs for secret object type

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

a226f7653620f8c5b570ca63c26df98bdc1d84c4