[MERGE] merge trunk-new-graphview-ged into trunk (mainly a short bug fix in data.js
[MERGE] merge trunk-new-graphview-ged into trunk (mainly a short bug fix in data.js

havt/openerp-web,havt/openerp-web,havt/openerp-web,havt/openerp-web,havt/openerp-web