Merge commit 'origin/master' into packaging

Conflicts:

	Makefile

diff --cc Makefile
index ea5eb8c1f42620b71196df9f98162843f3db5736,c7907a0252be40df3f4fff928276c0bfb2857c64..65ecbe6b3e08c2562764f50b8c3abd187043fdaa
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -5,8 -5,8 +5,8 @@@ releases=etc
  sponsor_keyid=19D03486
  
  build=dpkg-buildpackage -sn -uc -us -rfakeroot -i'(.git|build|.gitignore|testing)*' -I.git -Ibuild -I.gitignore -Itesting
 -version=$(shell git-tag -l | grep '^[0-9]' | tail -1)
 -deb_version=$(shell git-tag -l | grep ^debian-[[:digit:]] | tail -1 | sed 's/debian-//')
 +version=$(shell git-tag -l | grep -v ^debian | tail -1)
- deb_version=$(shell git-tag -l | grep ^debian-puck | tail -1 | sed 's/debian-puck-//')
++deb_version=$(shell git-tag -l | grep ^debian-etch-[[:digit:]] | tail -1 | sed 's/debian-etch-//')
  
  deb=$(package)_$(deb_version)_all.deb
  orig_tarball=../$(package)_$(version).orig.tar.gz

diff --cc debian/control
Simple merge