beremiz

merge

2010-06-01, Lolitech
881c0b3f0204
merge
from canfestival import *