1.2.2
Merge branch 'raring' into lucid

Conflicts:
	debian/changelog