changes from Jorn
Merge branch 'ballerup' of git://github.com/bellcom/os2dagsorden into ballerup