- Merged fixes 1394 and 1395 from trunk to PolarSSL 1.2 branch

8 files changed