Frodes commit to the yahoo3 project
Merge pull request #7 from frodelu/master

Content from Norway