Merge branch 'master' of ssh://dolda2000.com/srv/git/r/kaka/cakelight