fixed conflicts
[meabook] / constants.py
2010-06-19 Max Usachevadded constants module