[MERGE] merge with trunk
authorFabien Meghazi <fme@openerp.com>
Tue, 30 Aug 2011 14:06:52 +0000 (16:06 +0200)
committerFabien Meghazi <fme@openerp.com>
Tue, 30 Aug 2011 14:06:52 +0000 (16:06 +0200)
commitd8b26533ecfb8484c40cec8fc737b6eec790a501
tree8bfd98ea8225a045b925b4dd5cac845ed97b23f6
parentedeffae67c9b56dc1188f0c2b092475685465b20
parent9141044fc2b05bda152ea45304936f5ff6050a3a
[MERGE] merge with trunk

bzr revid: fme@openerp.com-20110830140652-bd5ddeefqylyrh00
addons/base/static/src/js/form.js
addons/base/static/src/js/views.js