[MERGE] merged with main trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 9 Dec 2011 16:21:39 +0000 (17:21 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 9 Dec 2011 16:21:39 +0000 (17:21 +0100)
commit7a7a4c2ea9a1e12a656b365b8e584a778949ab33
tree75da6bd1b168144b700976a2c9c5aa2b579124ef
parent91edca60591cd46af32cb7319ef0b376754ca757
parentc3bbd5c2d7db7f46fe1535edaaf60e314f553cf0
[MERGE] merged with main trunk

bzr revid: qdp-launchpad@openerp.com-20111209162139-9siz7s4akq3wlyhb