tree 7622b53a77335032b4121cc6a4769096ee63917b
parent 4a2bd0da0fac1ee6d596a35bfcaf4031905898fa
author Paul Bakker <p.j.bakker@polarssl.org> 1351860806 +0000
committer Paul Bakker <p.j.bakker@polarssl.org> 1351860806 +0000

 - Merged 1397 in branch for 1.2