Merge branch 'master' of https://git.maemo.org/projects/feedingit
[feedingit] / welcome
2009-12-29 www-datawelcome