Merge remote branch 'origin/master' into optimize
authorP. Christeas <p_christ@hol.gr>
Mon, 26 Oct 2009 10:56:50 +0000 (12:56 +0200)
committerP. Christeas <p_christ@hol.gr>
Mon, 26 Oct 2009 10:56:50 +0000 (12:56 +0200)
commit5ee5a1caef3c2e28622e53ecddf2c13c0efcf4c4
tree8a520aaf907ebd233fee957d0529c5c41333a832
parentc716ecb7319af022447d9685b61e92ab45cc0b80
parentda2e99051a57989c592418668ab4614baf142c4e
Merge remote branch 'origin/master' into optimize

Conflicts:
bin/osv/expression.py
bin/osv/orm.py

bzr revid: p_christ@hol.gr-20091026105650-49wvuk3o7qw1ybkn
bin/addons/base/module/report/ir_module_reference_print.py
bin/osv/expression.py
bin/osv/orm.py
bin/report/render/rml2pdf/trml2pdf.py