Check for CPimport.txt in devel tree.
Merge remote-tracking branch 'johansson/trunk' into trunk
Merge remote-tracking branch 'hart/trunk' into trunk

Conflicts:
	qadic/ctx_init_conway.c
Another attempt to get correct ARM/Thumb/Thumb2 assembly code.
Merge remote-tracking branch 'hart/trunk' into trunk
Fix NTL interface tests. Reported by Francois Bissey.
Merge remote-tracking branch 'hart/trunk' into trunk
Fix test for empty string in install target.