[MERGE] trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 20 Sep 2012 10:11:59 +0000 (12:11 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 20 Sep 2012 10:11:59 +0000 (12:11 +0200)
commit79da3791309cb440a6463bc888f3362fb6853047
tree79632b8a7a07e2ed45bef200dc5491cacc5473d2
parente7eec72ae98e2920ef12e5d2a281775a26b961a2
parentaceff3a48bc91ffaacad17ad1fdce43181a9c562
[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20120920101159-oaz40ygm6md27i8y