beremiz

merge

2012-05-22, Edouard Tisserant
bdab45f96aa0
merge
from wxglade_hmi import *