Merge branch 'master' of ssh://laiskiainen.org/home/pmatilai/apt-rpm/scm/apt