In the last decade, French curricula for secondary school have included contents in Computer Science inside Mathematics curricula. We study this particular situation by questioning the history of the introduction of Computer Science in school in France, by analyzing the links between Mathematics and Computer Science in the curricula (based on epistemological considerations), and by enlightening the issues of this curriculum under development.