[MERGE] Merge last trunk

bzr revid: fme@openerp.com-20120111085337-u65f0pyr1n60mkaw

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc addons/web/static/src/js/view_list.js
index b9ba171,2615ea2..63f9dfd
--- 1/addons/web/static/src/js/view_list.js
--- 2/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@@ -1288,9 -1301,9 +1300,9 @@@ openerp.web.ListView.Groups = openerp.w
              page = this.datagroup.openable ? this.page : view.page;
  
          var fields = _.pluck(_.select(this.columns, function(x) {return x.tag == "field"}), 'name');
-         var options = { offset: page * limit, limit: limit };
+         var options = { offset: page * limit, limit: limit, context: {bin_size: true} };
          //TODO xmo: investigate why we need to put the setTimeout
 -        $.async_when().then(function() {dataset.read_slice(fields, options , function (records) {
 +        $.async_when().then(function() {dataset.read_slice(fields, options).then(function (records) {
              // FIXME: ignominious hacks, parents (aka form view) should not send two ListView#reload_content concurrently
              if (self.records.length) {
                  self.records.reset(null, {silent: true});