[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Mon, 4 Mar 2013 09:50:11 +0000 (10:50 +0100)
committerRaphael Collet <rco@openerp.com>
Mon, 4 Mar 2013 09:50:11 +0000 (10:50 +0100)
commit25897ca3e45087bc5ebf5b7b408af2def6e070e0
tree6863b84deb157552c26d1bb7419801844843939a
parent2a0245b20c30e564a9d1e89afdc47583fd42d5b6
parentb46c9dae1b3c73077d7f518fb212245a47544fbf
[MERGE] from trunk

bzr revid: rco@openerp.com-20130304095011-7z33bpgik5n2jnuv