beremiz

merge

2010-06-04, ed
464d470bdbd7
merge
from python import *