beremiz

merge

2012-03-11, laurent
b0a7abd50b09
merge
from python import *