Updating changelog
Merge branch 'master' into squeeze-backports

Conflicts:
	debian/changelog