[MERGE] OPW 572488: report sxw/odt: fix inconsistent duplicate content/meta/style files within generated sxw/odt        forward-port of v6.0 server revid: xal@openerp.com-20130102152925-h81qv2fx300oakzv
[MERGE] OPW 572488: report sxw/odt: fix inconsistent duplicate content/meta/style files within generated sxw/odt
  
    forward-port of v6.0 server revid: xal@openerp.com-20130102152925-h81qv2fx300oakzv

gisce/openobject-server,gisce/openobject-server,MarkusTeufelberger/openobject-server,splbio/openobject-server,gisce/openobject-server,MarkusTeufelberger/openobject-server,splbio/openobject-server,MarkusTeufelberger/openobject-server,splbio/openobject-server