[MERGE] Merge with trunk upto revision no 698.
authorYogesh (OpenERP) <ysa@tinyerp.com>
Thu, 28 Jul 2011 05:22:48 +0000 (10:52 +0530)
committerYogesh (OpenERP) <ysa@tinyerp.com>
Thu, 28 Jul 2011 05:22:48 +0000 (10:52 +0530)
commitebe00f729211807393b9fb6911328fbaca76f867
treea7f854236d95878c5618b07f5b214eab4c7b6ee2
parente766d1892f3c3aaacebef4c180794c2757bffffc
parent556d06c65ba0786afbc97732a4bcc8e00b3af082
[MERGE] Merge with trunk upto revision no 698.

bzr revid: ysa@tinyerp.com-20110728052248-5z3nuv4t8f77haj9
addons/base/__openerp__.py
addons/base/static/src/js/boot.js
addons/base/static/src/js/views.js