beremiz

merge

2012-06-14, Edouard Tisserant
3f3f1b8fcb07
merge
from c_ext import *