debian multicore build reverted
Merge branch 'devel' into launchpad.net

Conflicts:
	debian/rules