[MERGE] Merge wtih trunk upto revision no 1046.
authorYogesh (OpenERP) <ysa@tinyerp.com>
Wed, 5 Oct 2011 05:16:39 +0000 (10:46 +0530)
committerYogesh (OpenERP) <ysa@tinyerp.com>
Wed, 5 Oct 2011 05:16:39 +0000 (10:46 +0530)
commitaad669d89e59be36443d7886ea21acfb064c78ac
treea73677aa3bdacdea3873a8d166da27f9f2f51be1
parent59ef6514220f2e1d6a69024688abb0479e914dab
parent15a6b81dbe5c0677f28636d44e4161132ec211b0
[MERGE] Merge wtih trunk upto revision no 1046.

bzr revid: ysa@tinyerp.com-20111005051639-8tkce0yihk3ksfv5
addons/web/static/src/js/core.js
addons/web/static/src/js/views.js