fixed merge probem jonas-thomas
Merge branch 'nastybugs' of github.com:tass-belgium/picotcp into nastybugs