Package 1.2-2
Package 1.2-3
Merge branch 'debian' into debian-squeeze

Conflicts:
	debian/changelog
Package 1.2-3~bpo60+1