Merge tag 'v1.0-1' into debian-squeeze

Conflicts:
	debian/changelog
Update precompiled_manpage.patch
Package 1.0-1~bpo60+1