1.2.5
Merge branch 'saucy' into lucid

Conflicts:
	debian/changelog