[MERGE] from Geoff Gardiner

bzr revid: stephane@tinyerp.com-20090127101030-jh0oldlr451zpdq2

diff --cc bin/addons/base/ir/ir_model.py
Simple merge

diff --cc bin/addons/base/module/module.py
Simple merge

diff --cc bin/addons/base/res/res_user.py
Simple merge