Merge commit 'garage/master'
[connman] / welcome
2009-06-24 www-datawelcome