Merge commit 'origin/master' into mdv-gpl3

bzr revid: p_christ@hol.gr-20081207195509-2tb8fb3d7qr2xigt
bzr revid: p_christ@hol.gr-20081210075901-97mt6chs3ljokpsx

diff --cc bin/addons/base/ir/ir.xml
Simple merge

diff --cc bin/import_xml.rng
Simple merge

diff --cc bin/netsvc.py
Simple merge

diff --cc bin/osv/orm.py
Simple merge

diff --cc bin/tools/convert.py
Simple merge

diff --cc bin/tools/translate.py
Simple merge