[MERGE] merged 6.0.
authorVo Minh Thu <vmt@openerp.com>
Wed, 6 Apr 2011 10:47:18 +0000 (12:47 +0200)
committerVo Minh Thu <vmt@openerp.com>
Wed, 6 Apr 2011 10:47:18 +0000 (12:47 +0200)
commita0c1363fd68a0c31d5b6cfe0cf11cf3e7ca9ce33
tree5b96c18373c6e27c017a2f4fc808654aa959368f
parenta78522a42a28bcaf787b60315e588ce19f122d96
parent86bc2a6451db51be840a5f8744be2ddc18a9e681
[MERGE] merged 6.0.

bzr revid: vmt@openerp.com-20110406104718-cdcyq74rltf102sa
12 files changed:
openerp/addons/base/i18n/bg.po
openerp/addons/base/i18n/de.po
openerp/addons/base/i18n/fr.po
openerp/addons/base/i18n/it.po
openerp/addons/base/i18n/ko.po
openerp/addons/base/i18n/nb.po
openerp/addons/base/i18n/pl.po
openerp/addons/base/i18n/pt_BR.po
openerp/addons/base/i18n/ro.po
openerp/addons/base/ir/ir_model.py
openerp/addons/base/ir/ir_ui_view.py
openerp/osv/orm.py