[MERGE] lp:~openerp-dev/openobject-server/trunk-wkhtmltopdf-stw
authorStephane Wirtel <stw@openerp.com>
Thu, 16 Feb 2012 09:33:19 +0000 (10:33 +0100)
committerStephane Wirtel <stw@openerp.com>
Thu, 16 Feb 2012 09:33:19 +0000 (10:33 +0100)
bzr revid: stw@openerp.com-20120216093319-3a5n7bdky4bm6k5e


Trivial merge