[MERGE]With trunk.

bzr revid: bth@tinyerp.com-20131206062506-0mx9y3awczrsatrk
bzr revid: bth@tinyerp.com-20131211104422-a103eynbuyx6a1ng

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

diff --cc addons/web_kanban/static/src/js/kanban.js
Simple merge

diff --cc addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js
index d9a8542,1d185b7..29cc5bf
--- 1/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js
--- 2/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js
+++ b/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js
@@@ -27,7 -28,7 +28,7 @@@ instance.web_kanban.SparklineBarWidget 
                      }
                  }, self.options);
              self.$el.sparkline(value, sparkline_options);
-             self.$el.children().tooltip({'html': true, 'title': function(){return title}, 'container': 'body', 'placement': 'bottom'});
 -            self.$el.tipsy({'delayIn': self.options.delayIn || 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'});
++            self.$el.children().tooltip({'delayIn': self.options.delayIn || 0, 'html': true, 'title': function(){return title}, 'container': 'body', 'placement': 'bottom'});
          }, 0);
      },
  });