Conflicts: bin/addons/base/module/module.py bzr revid: p_christ@hol.gr-20101123154306-j88k617evep9napa