[MERGE] merge few bugfixes
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 28 Jun 2012 12:23:36 +0000 (14:23 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 28 Jun 2012 12:23:36 +0000 (14:23 +0200)
bzr revid: qdp-launchpad@openerp.com-20120628122336-jece4hu086ojtigj


Trivial merge