Merge branch 'knobs' of git+ssh://scm.gforge.inria.fr/gitroot/starpu/starpu into knobs

Conflicts:
	src/common/knobs.c
	src/common/knobs.h
	src/core/task.c