change locking behaviour, simplify it
Merge branch 'simplify-locking' of git://github.com/kesla/medea into kesla-simplify-locking
Merge branch 'kesla-simplify-locking'