[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Mon, 8 Oct 2012 15:16:38 +0000 (17:16 +0200)
committerRaphael Collet <rco@openerp.com>
Mon, 8 Oct 2012 15:16:38 +0000 (17:16 +0200)
commit8d8e15dd2bb2807f0ab07dd067ad8c2aa1d6cbf5
tree4d6caca6f3fb14161748f89790efe75d360164a7
parent13e3792d42569b20883d3adbb62b2aef127d8c8c
parentcf35464125f0625100bd52111268534c116f3873
[MERGE] from trunk

bzr revid: rco@openerp.com-20121008151638-27jt1dm0jxa5xla3