tree feeb954703ef243308d49ca80bdcb6ca2e7852ff
parent 53443e4fa42a9d79c89b55b41f1d36df79a85876
author Paul Bakker <p.j.bakker@polarssl.org> 1254670712 +0000
committer Paul Bakker <p.j.bakker@polarssl.org> 1254670712 +0000

 - Merged trunk changes 818-819 into the 0.12 branch