Merge branch 'master' of drop.maemo.org:/git/monky