[MERGE] lp:700154
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 24 Mar 2011 10:08:14 +0000 (11:08 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 24 Mar 2011 10:08:14 +0000 (11:08 +0100)
commit7c1ea9057b7ce7c11f839be16448b26a28573e70
tree172191b9d41effbc8707cd025ff22fe1dd738fe3
parenta51d1c0c4960faa3fd0ab1103230aa13dee227e2
parenta9b4e238afd4e60b8c78a61ccb6eff4da4b241f3
[MERGE] lp:700154

bzr revid: qdp-launchpad@openerp.com-20110324100814-c3lz3vak7u5zs1ae