Includes latest korina fixes. Signed-off-by: Roman Yeryomin <roman@advem.lv> [rewrite commit message (subject <= 50 characters)] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>