Merge branch 'master' of ssh://git.gpleda.org/home/git/gerbv