changelog
aclocal
show with effect
Merge branch 'master' of github.com:fransschreuder/usbpicprog

Conflicts:
	trunk/upp_wx/debian/changelog