FFS 5.12
Merge branch 'ubuntu-precise' into ubuntu-quantal

Conflicts:
	debian/changelog