Merge branch 'develop' of ssh://drop.maemo.org/git/lichviet into develop