[MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al.

bzr revid: dka@tinyerp.com-20140113130212-4f17b0inc4u3s5k3
bzr revid: dka@tinyerp.com-20140115052550-15ulprts5fo6s30r

diff --cc addons/product/product.py
index 25a5a43,1637854..c4049fb
--- 1/addons/product/product.py
--- 2/addons/product/product.py
+++ b/addons/product/product.py
@@@ -23,8 -23,8 +23,10 @@@ import mat
  import re
  
  from _common import rounding
 -from openerp import SUPERUSER_ID
 +from lxml import etree
+ 
 +from openerp.osv.orm import setup_modifiers
++from openerp import SUPERUSER_ID
  from openerp import tools
  from openerp.osv import osv, fields
  from openerp.tools.translate import _

diff --cc addons/product/product_view.xml
Simple merge